ChangeLogTag: Mon Jun 13 18:00:05 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>

6 files changed, 10 insertions, 141 deletions

diff --git a/tests/COIOP/COIOP_Test.cpp b/tests/COIOP/COIOP_Test.cpp
index 6d20ffbb864..3307a10c1fc 100644
--- a/tests/COIOP/COIOP_Test.cpp
+++ b/tests/COIOP/COIOP_Test.cpp
@@ -40,7 +40,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         // This is a hack but that is okay!
         return 0;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/COIOP/Client_Task.cpp b/tests/COIOP/Client_Task.cpp
index 802bb456e7b..4618639b2b0 100644
--- a/tests/COIOP/Client_Task.cpp
+++ b/tests/COIOP/Client_Task.cpp
@@ -1,13 +1,10 @@
-//
+// -*- C++ -*-
 // $Id$
-//
 
 #include "Client_Task.h"
 #include "tao/ORB_Core.h"
 #include "TestC.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (const ACE_TCHAR *ior,
                           CORBA::ORB_ptr corb,
                           ACE_Thread_Manager *thr_mgr,
diff --git a/tests/COIOP/Hello.cpp b/tests/COIOP/Hello.cpp
index 5d2383f3a68..71272b4add1 100644
--- a/tests/COIOP/Hello.cpp
+++ b/tests/COIOP/Hello.cpp
@@ -1,18 +1,16 @@
-//
+// -*- C++ -*-
 // $Id$
-//
+
 #include "Hello.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
-  Hello::Hello (CORBA::ORB_ptr orb,
-              ACE_thread_t thrid)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-    , thr_id_ (thrid)
+Hello::Hello (CORBA::ORB_ptr orb,
+            ACE_thread_t thrid)
+: orb_ (CORBA::ORB::_duplicate (orb))
+  , thr_id_ (thrid)
 {
 }
 
diff --git a/tests/COIOP/Hello.h b/tests/COIOP/Hello.h
index 556409e5d00..1d5e27d075f 100644
--- a/tests/COIOP/Hello.h
+++ b/tests/COIOP/Hello.h
@@ -8,8 +8,6 @@
 
 #include "TestS.h"
 
-#include "ace/OS.h"
-
 /// Implement the Test::Hello interface
 class Hello
   : public virtual POA_Test::Hello
diff --git a/tests/COIOP/Makefile.am b/tests/COIOP/Makefile.am
deleted file mode 100644
index 02a21c418f1..00000000000
--- a/tests/COIOP/Makefile.am
+++ /dev/null
@@ -1,119 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.COIOP_Tests_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.COIOP_Simple_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += COIOP_Simple_Test
-
-COIOP_Simple_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-COIOP_Simple_Test_SOURCES = \
-  COIOP_Simple_Test.cpp \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Hello.h
-
-COIOP_Simple_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.COIOP_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += COIOP_Test
-
-COIOP_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-COIOP_Test_SOURCES = \
-  COIOP_Test.cpp \
-  Client_Task.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  Server_Task.h
-
-COIOP_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/COIOP/Server_Task.cpp b/tests/COIOP/Server_Task.cpp
index f2f09819674..f7bf8b30613 100644
--- a/tests/COIOP/Server_Task.cpp
+++ b/tests/COIOP/Server_Task.cpp
@@ -1,17 +1,12 @@
-//
+// -*- C++ -*-
 // $Id$
-//
+
 #include "Server_Task.h"
 #include "TestS.h"
 #include "Hello.h"
 
 #include "ace/Manual_Event.h"
 
-ACE_RCSID(Collocated_Test,
-          Server_Task,
-          "$Id$")
-
-
 Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,