Thu Aug 26 13:44:36 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * orbsvcs/Dump_Schedule/Dump_Schedule.cpp:
        * orbsvcs/Event_Service/Event_Service.cpp:
        * orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp:
        * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp:
        * tests/AMH_Exceptions/client.cpp:
        * tests/AMH_Exceptions/server.cpp:
        * tests/Abstract_Interface/client.cpp:
        * tests/Abstract_Interface/server.cpp:
        * tests/Abstract_Interface/test_i.h:
        * tests/Abstract_Interface/test_i.cpp:
        * tests/Alt_Mapping/options.cpp:
        * tests/Bug_2677_Regression/DllORB.cpp:
        * tests/Bug_2936_Regression/DllORB.cpp:
        * tests/Bug_2966_Regression/Hello.cpp:
        * tests/Bug_2966_Regression/client.cpp:
        * tests/Bug_2966_Regression/server.cpp:
        * tests/Bug_3251_Regression/DllOrb.cpp:
        * tests/Bug_3524_Regression/client.cpp:
        * tests/Bug_3524_Regression/server.cpp:
        * tests/Bug_3524_Regression/test_i.cpp:
        * tests/Bug_3542_Regression/DllOrb.cpp:
        * tests/Bug_3647_Regression/Backend_Impl.cpp:
        * tests/Bug_3647_Regression/Middle_Impl.cpp:
        * tests/Bug_3647_Regression/backend_server.cpp:
        * tests/Bug_3647_Regression/client.cpp:
        * tests/Bug_3647_Regression/middle_server.cpp:
        * tests/COIOP/Client_Task.cpp:
        * tests/COIOP/Hello.cpp:
        * tests/COIOP/Server_Task.cpp:
        * tests/MProfile_Connection_Timeout/client.cpp:
        * tests/MProfile_Connection_Timeout/server.cpp:
        * tests/OctetSeq/OctetSeq.cpp:
        * tests/OctetSeq/client.cpp:
        * tests/OctetSeq/server.cpp:
        * tests/OctetSeq/test_i.cpp:
        * tests/POA/Default_Servant/Default_Servant.cpp:
        * tests/Param_Test/ub_struct_seq.cpp:
        * tests/TransportCurrent/Framework/Current_Test_Impl.cpp:
        * tests/TransportCurrent/Framework/Server_Main.cpp:
        * tests/TransportCurrent/Framework/Tester.cpp:
        * tests/TransportCurrent/Framework/server.cpp:
        * tests/TransportCurrent/Framework/simple.cpp:
        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
        * tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp:
        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
        * tests/TransportCurrent/IIOP/client.cpp:
        * tests/TransportCurrent/IIOP/server.cpp:
        * tests/TransportCurrent/lib/Client_ORBInitializer.cpp:
        * tests/TransportCurrent/lib/Client_Request_Interceptor.cpp:
        * tests/TransportCurrent/lib/Current_Test.idl:
        * tests/TransportCurrent/lib/Server_ORBInitializer.cpp:
        * tests/TransportCurrent/lib/Server_Request_Interceptor.cpp:
          Various cleanup

        * tao/Utils/Auto_Functor.h:
        * tao/Auto_Functor.h:
          Removed this file, use the ACE file

48 files changed, 63 insertions, 185 deletions

diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp
index 403234a50d0..0d0fd5dd650 100644
--- a/TAO/tests/AMH_Exceptions/client.cpp
+++ b/TAO/tests/AMH_Exceptions/client.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "TestC.h"
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 2a948434c95..276beac855d 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -1,4 +1,4 @@
-
+// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp
index c4a678fc71a..4a387d4f0da 100644
--- a/TAO/tests/Abstract_Interface/client.cpp
+++ b/TAO/tests/Abstract_Interface/client.cpp
@@ -1,12 +1,9 @@
+// -*- C++ -*-
 // $Id$
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Abstract_Interface,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior_input_file = ACE_TEXT ("file://test.ior");
 int debug = 0;
 
diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp
index f9d003d7fda..5add88308eb 100644
--- a/TAO/tests/Abstract_Interface/server.cpp
+++ b/TAO/tests/Abstract_Interface/server.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Abstract_Interface,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp
index 7e9c8163f92..b9d4146601d 100644
--- a/TAO/tests/Abstract_Interface/test_i.cpp
+++ b/TAO/tests/Abstract_Interface/test_i.cpp
@@ -1,13 +1,9 @@
+// -*- C++ -*-
 // $Id$
 
 #include "test_i.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (Abstract_Interface,
-           test_i,
-           "$Id$")
-
 char *
 foo_i::foo_op (const char * inarg)
 {
diff --git a/TAO/tests/Abstract_Interface/test_i.h b/TAO/tests/Abstract_Interface/test_i.h
index 855edd98712..4f0198e6f52 100644
--- a/TAO/tests/Abstract_Interface/test_i.h
+++ b/TAO/tests/Abstract_Interface/test_i.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #ifndef TAO_TEST_I_H
diff --git a/TAO/tests/Alt_Mapping/options.cpp b/TAO/tests/Alt_Mapping/options.cpp
index 66055e12438..7f662b7d7a7 100644
--- a/TAO/tests/Alt_Mapping/options.cpp
+++ b/TAO/tests/Alt_Mapping/options.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -24,10 +25,6 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Param_Test,
-           options,
-           "$Id$")
-
 // Constructor.p
 Options::Options (void)
   : ior_ (CORBA::string_dup ("file://test.ior")),
diff --git a/TAO/tests/Bug_2677_Regression/DllORB.cpp b/TAO/tests/Bug_2677_Regression/DllORB.cpp
index 543eb993938..243fa017ebe 100644
--- a/TAO/tests/Bug_2677_Regression/DllORB.cpp
+++ b/TAO/tests/Bug_2677_Regression/DllORB.cpp
@@ -5,7 +5,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/TAO_Singleton_Manager.h"
 
-
 DllORB::DllORB (void)
  : failPrePostInit_ (3),
    mv_orb_ (),
@@ -13,12 +12,10 @@ DllORB::DllORB (void)
 {
 }
 
-
 DllORB::~DllORB (void)
 {
 }
 
-
 int
 DllORB::init (int argc, ACE_TCHAR *argv[])
 {
@@ -87,8 +84,7 @@ DllORB::init (int argc, ACE_TCHAR *argv[])
         }
 
       // Initialize the ORB
-      ACE_Argv_Type_Converter argcon (argc, argv);
-      mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ());
+      mv_orb_ = CORBA::ORB_init (argc, argv);
       if (CORBA::is_nil (mv_orb_.in ()))
         {
           ACE_DEBUG ((LM_ERROR, ACE_TEXT ("nil ORB\n")));
diff --git a/TAO/tests/Bug_2936_Regression/DllORB.cpp b/TAO/tests/Bug_2936_Regression/DllORB.cpp
index 77e0d78b0a8..4abd4b6e9ca 100644
--- a/TAO/tests/Bug_2936_Regression/DllORB.cpp
+++ b/TAO/tests/Bug_2936_Regression/DllORB.cpp
@@ -90,8 +90,7 @@ DllORB::init (int argc, ACE_TCHAR *argv[])
         }
 
       // Initialize the ORB
-      ACE_Argv_Type_Converter argcon (argc, argv);
-      mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ());
+      mv_orb_ = CORBA::ORB_init (argc, argv);
       if (CORBA::is_nil (mv_orb_.in ()))
         {
           ACE_DEBUG ((LM_ERROR, ACE_TEXT ("nil ORB\n")));
diff --git a/TAO/tests/Bug_2966_Regression/Hello.cpp b/TAO/tests/Bug_2966_Regression/Hello.cpp
index df5dc90d3d9..ec53524c2f8 100644
--- a/TAO/tests/Bug_2966_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2966_Regression/Hello.cpp
@@ -1,9 +1,7 @@
-//
+// -*- C++ -*-
 // $Id$
-//
-#include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+#include "Hello.h"
 
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Bug_2966_Regression/client.cpp b/TAO/tests/Bug_2966_Regression/client.cpp
index 5991a418b53..9097c9f9de6 100644
--- a/TAO/tests/Bug_2966_Regression/client.cpp
+++ b/TAO/tests/Bug_2966_Regression/client.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicInterface/Request.h"
@@ -6,8 +7,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_2966_Regression/server.cpp b/TAO/tests/Bug_2966_Regression/server.cpp
index 8dc401a83ab..9fff3830b33 100644
--- a/TAO/tests/Bug_2966_Regression/server.cpp
+++ b/TAO/tests/Bug_2966_Regression/server.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "Hello.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.cpp b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
index 83708d86fde..b21f30a9b7b 100644
--- a/TAO/tests/Bug_3251_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
@@ -44,8 +44,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
     }
 
     // Initialize the ORB
-    ACE_Argv_Type_Converter argcon (argc, argv);
-    mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ());
+    mv_orb_ = CORBA::ORB_init (argc, argv);
     if (CORBA::is_nil (mv_orb_.in ()))
     {
       ACE_DEBUG ((LM_ERROR, ACE_TEXT ("nil ORB\n")));
diff --git a/TAO/tests/Bug_3524_Regression/client.cpp b/TAO/tests/Bug_3524_Regression/client.cpp
index 725b57503bd..3b511be26f8 100644
--- a/TAO/tests/Bug_3524_Regression/client.cpp
+++ b/TAO/tests/Bug_3524_Regression/client.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/Synch.h"
 #include "testC.h"
 
-ACE_RCSID(Bug_3524_Regression,
-          client,
-          "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_3524_Regression/server.cpp b/TAO/tests/Bug_3524_Regression/server.cpp
index 9052d258e5f..1d206f7f304 100644
--- a/TAO/tests/Bug_3524_Regression/server.cpp
+++ b/TAO/tests/Bug_3524_Regression/server.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "test_i.h"
 
-ACE_RCSID (Bug_3524_Regression,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
diff --git a/TAO/tests/Bug_3524_Regression/test_i.cpp b/TAO/tests/Bug_3524_Regression/test_i.cpp
index 9e8b93eea9d..9b781340732 100644
--- a/TAO/tests/Bug_3524_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3524_Regression/test_i.cpp
@@ -1,12 +1,9 @@
-// $Id: test_i.cpp,v 1.1 2003/08/27 22:43:35 vz Exp
+// -*- C++ -*-
+// $Id$
 
 #include "test_i.h"
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (Bug_3524_Regression,
-           test_i,
-           "$Id$")
-
 A_i::A_i (CORBA::ORB_ptr orb,
           CORBA::ValueFactoryBase *vtp_factory)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.cpp b/TAO/tests/Bug_3542_Regression/DllOrb.cpp
index 016ce3747b3..3db4aeac4d4 100644
--- a/TAO/tests/Bug_3542_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3542_Regression/DllOrb.cpp
@@ -6,7 +6,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/TAO_Singleton_Manager.h"
 
-
 DllOrb::DllOrb (void)
  :
    ma_barrier_(),
@@ -15,12 +14,10 @@ DllOrb::DllOrb (void)
 {
 }
 
-
 DllOrb::~DllOrb (void)
 {
 }
 
-
 int
 DllOrb::init (int argc, ACE_TCHAR *argv[])
 {
@@ -44,8 +41,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
     }
 
     // Initialize the ORB
-    ACE_Argv_Type_Converter argcon (argc, argv);
-    mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ());
+    mv_orb_ = CORBA::ORB_init (argc, argv);
     if (CORBA::is_nil (mv_orb_.in ()))
     {
       ACE_DEBUG ((LM_ERROR, ACE_TEXT ("nil ORB\n")));
diff --git a/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp b/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
index d3752c32b41..1ec74f02486 100644
--- a/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
+++ b/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
@@ -1,8 +1,9 @@
+// -*- C++ -*-
+// $Id$
+
 #include "Backend_Impl.h"
 #include "ace/OS.h"
 
-ACE_RCSID(Bug_3647_Regression, Backend_Impl, "$Id$")
-
 Bug_3647_Regression::Backend_Impl::
 Backend_Impl(CORBA::ORB_ptr orb, bool verbose)
   : POA_Bug_3647_Regression::Backend()
diff --git a/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp b/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
index 4a5fa30195d..15c0220d478 100644
--- a/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
+++ b/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
@@ -1,6 +1,7 @@
-#include "Middle_Impl.h"
+// -*- C++ -*-
+// $Id$
 
-ACE_RCSID(Bug_3647_Regression, Middle_Impl, "$Id$")
+#include "Middle_Impl.h"
 
 Bug_3647_Regression::Middle_Impl::
 Middle_Impl(
diff --git a/TAO/tests/Bug_3647_Regression/backend_server.cpp b/TAO/tests/Bug_3647_Regression/backend_server.cpp
index 974686b3025..630d0cdc1ad 100644
--- a/TAO/tests/Bug_3647_Regression/backend_server.cpp
+++ b/TAO/tests/Bug_3647_Regression/backend_server.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "Backend_Impl.h"
@@ -8,10 +9,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Bug_3647_Regression,
-           backend_server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("backend.ior");
 bool verbose = false;
 
diff --git a/TAO/tests/Bug_3647_Regression/client.cpp b/TAO/tests/Bug_3647_Regression/client.cpp
index 993a1a76ec6..b91dea59417 100644
--- a/TAO/tests/Bug_3647_Regression/client.cpp
+++ b/TAO/tests/Bug_3647_Regression/client.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "TestC.h"
@@ -7,10 +8,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_3647_Regression,
-          client,
-          "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://middle.ior");
 bool verbose = true;
 long timeout = 2;
diff --git a/TAO/tests/Bug_3647_Regression/middle_server.cpp b/TAO/tests/Bug_3647_Regression/middle_server.cpp
index 23a03de8eeb..a1822be9578 100644
--- a/TAO/tests/Bug_3647_Regression/middle_server.cpp
+++ b/TAO/tests/Bug_3647_Regression/middle_server.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "Middle_Impl.h"
@@ -11,10 +12,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Bug_3647_Regression,
-           middle_server,
-           "$Id$")
-
 bool verbose = false;
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("middle.ior");
 const ACE_TCHAR *ior = ACE_TEXT ("file://backend.ior");
diff --git a/TAO/tests/COIOP/Client_Task.cpp b/TAO/tests/COIOP/Client_Task.cpp
index 802bb456e7b..4618639b2b0 100644
--- a/TAO/tests/COIOP/Client_Task.cpp
+++ b/TAO/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/TAO/tests/COIOP/Hello.cpp b/TAO/tests/COIOP/Hello.cpp
index 5d2383f3a68..71272b4add1 100644
--- a/TAO/tests/COIOP/Hello.cpp
+++ b/TAO/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/TAO/tests/COIOP/Server_Task.cpp b/TAO/tests/COIOP/Server_Task.cpp
index f2f09819674..f7bf8b30613 100644
--- a/TAO/tests/COIOP/Server_Task.cpp
+++ b/TAO/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,
diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp
index 596ae335751..a5e5f18e607 100644
--- a/TAO/tests/MProfile_Connection_Timeout/client.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/IORManipulation/IORManip_Loader.h"
@@ -8,10 +9,6 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(MProfile_Connection_Timeout,
-          client,
-          "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int do_shutdown = 0;
 
diff --git a/TAO/tests/MProfile_Connection_Timeout/server.cpp b/TAO/tests/MProfile_Connection_Timeout/server.cpp
index 7d7dfdb3feb..7f4fb8c7042 100644
--- a/TAO/tests/MProfile_Connection_Timeout/server.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/server.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(MProfile_Connection_Timeout,
-          server,
-          "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 int orb_run = 0;
 int
diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp
index c896d05fd26..aaec6fc62eb 100644
--- a/TAO/tests/OctetSeq/OctetSeq.cpp
+++ b/TAO/tests/OctetSeq/OctetSeq.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -26,8 +27,6 @@
 #include "testC.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(OctetSeq, OctetSeq, "$Id$")
-
 static int
 test_write_octet (TAO_OutputCDR &cdr,
                   char* /* buf */,
diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp
index ecaf3588334..ebc2879a765 100644
--- a/TAO/tests/OctetSeq/client.cpp
+++ b/TAO/tests/OctetSeq/client.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "ace/Get_Opt.h"
@@ -7,8 +8,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(OctetSeq, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 ACE_RANDR_TYPE seed = 0;
diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp
index a27b76a8e3a..1562ea70624 100644
--- a/TAO/tests/OctetSeq/server.cpp
+++ b/TAO/tests/OctetSeq/server.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "ace/Get_Opt.h"
@@ -5,10 +6,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (OctetSeq,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp
index 39cd395e926..fb3a36f0e82 100644
--- a/TAO/tests/OctetSeq/test_i.cpp
+++ b/TAO/tests/OctetSeq/test_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "test_i.h"
@@ -7,8 +8,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(OctetSeq, test_i, "$Id$")
-
 Database_i::~Database_i (void)
 {
   delete[] this->elements_;
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.cpp b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
index 7ec6c3f722d..b548c0bec98 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.cpp
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
@@ -121,10 +121,10 @@ test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa)
 
   PortableServer::ServantBase_var servant =
     root_poa->reference_to_servant (object.in ());
-  expected_refcount++;
+  ++expected_refcount;
 
   root_poa->deactivate_object (id.in ());
-  expected_refcount--;
+  --expected_refcount;
 
   CORBA::ULong refcount =
     test._refcount_value ();
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index 633862bf044..1329be76e2f 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -19,10 +20,6 @@
 #include "helper.h"
 #include "ub_struct_seq.h"
 
-ACE_RCSID (Param_Test,
-           ub_struct_seq,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Struct_Sequence
 // ************************************************************************
diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
index 0697c11ac4c..b3f28bd21f5 100644
--- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
@@ -1,19 +1,16 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/TransportCurrent/TCC.h"
 
 #include "Current_Test_Impl.h"
 
-ACE_RCSID (Transport_Current,
-           Current_Test_Impl,
-           "$Id$")
-
-  Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb,
-                                        PortableServer::POA_ptr poa,
-                                        int do_collocated_calls)
-    : orb_ (CORBA::ORB::_duplicate (orb))
-    , poa_ (PortableServer::POA::_duplicate (poa))
-    , do_collocated_calls_ (do_collocated_calls)
+Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb,
+                                      PortableServer::POA_ptr poa,
+                                      int do_collocated_calls)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+  , poa_ (PortableServer::POA::_duplicate (poa))
+  , do_collocated_calls_ (do_collocated_calls)
 {
 }
 
diff --git a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
index a11a01d1f00..c6d7ad97d0f 100644
--- a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 // $Id$
 
 #include "Server_Request_Interceptor.h"
diff --git a/TAO/tests/TransportCurrent/Framework/Tester.cpp b/TAO/tests/TransportCurrent/Framework/Tester.cpp
index 1bc137d006e..a17fec6c9d2 100644
--- a/TAO/tests/TransportCurrent/Framework/Tester.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Tester.cpp
@@ -5,7 +5,6 @@
 
 using namespace TAO;
 
-
 /// Test referencing the TC data outside of the context of an upcall,
 /// or a client-side interceptor
 
diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp
index 6bb4bf2412f..062aa0107cb 100644
--- a/TAO/tests/TransportCurrent/Framework/server.cpp
+++ b/TAO/tests/TransportCurrent/Framework/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
@@ -10,10 +11,6 @@
 #include "Server_Request_Interceptor.h"
 #include "Server_ORBInitializer.h"
 
-ACE_RCSID (Transport_Current,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior");
 int nthreads = 1;
 int use_collocated_call = 1;
diff --git a/TAO/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp
index 5e6a3d92beb..0b5d3a458b2 100644
--- a/TAO/tests/TransportCurrent/Framework/simple.cpp
+++ b/TAO/tests/TransportCurrent/Framework/simple.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/ORB.h"
 #include "tao/Object.h"
@@ -6,10 +7,6 @@
 #include "ace/Service_Config.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (Transport_Current,
-           simple,
-           "$Id$")
-
 int
 testCurrentORBInitializer (int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
index c113ed14627..82f2f56d9ea 100644
--- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
@@ -1,15 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/TransportCurrent/TC_IIOPC.h"
 #include "tao/TransportCurrent/TCC.h"
 
 #include "Current_Test_Impl.h"
 
-ACE_RCSID (Transport_Current,
-           Current_Test_Impl,
-           "$Id$")
-
-
 Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb,
                                       PortableServer::POA_ptr poa,
                                       int do_collocated_calls)
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
index c4ed3e82c24..3005a704841 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 // $Id$
 
 #include "IIOP_Server_Request_Interceptor.h"
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
index a7d21f99423..b0918b36806 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
@@ -1,13 +1,10 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Constants.h"
 #include "tao/TransportCurrent/TC_IIOPC.h"
 
-ACE_RCSID (ForwardRequest,
-           Server_Request_Interceptor,
-           "$Id$")
-
 #include "IIOP_Server_Request_Interceptor.h"
 
 namespace Test {
@@ -162,8 +159,6 @@ namespace Test {
       && !has_remaining_endpoints;
   }
 
-
-
   void
   IIOP_Server_Request_Interceptor::inbound_process_context  (PortableInterceptor::ServerRequestInfo_ptr ri)
   {
@@ -216,11 +211,6 @@ namespace Test {
     this->pop_request_info (ACE_OS::atoi (buf));
   }
 
-
-
-
-
-
   void
   IIOP_Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri)
   {
@@ -241,7 +231,6 @@ namespace Test {
 
   }
 
-
   void
   IIOP_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
   {
diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp
index 7e7c5138f9b..5faa5e6ca69 100644
--- a/TAO/tests/TransportCurrent/IIOP/client.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
@@ -13,10 +14,6 @@
 
 #include "Client_ORBInitializer.h"
 
-ACE_RCSID (IIOP,
-           client,
-           "$Id$")
-
 // Prototype
 
 int
diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp
index ae2d595b403..420e2fec24b 100644
--- a/TAO/tests/TransportCurrent/IIOP/server.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
@@ -10,11 +11,6 @@
 #include "Server_Request_Interceptor.h"
 #include "Server_ORBInitializer.h"
 
-
-ACE_RCSID (Transport_Current,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior");
 int nthreads = 1;
 int use_collocated_call = 1;
@@ -55,10 +51,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-
-
 /// A helper class to encapsulate a task
-
 class Worker : public ACE_Task_Base
 {
 public:
@@ -72,16 +65,13 @@ private:
 
 
 /// Ctor
-
 Worker::Worker (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
-
 /// Test referencing the TC data *inside* the context of a client-side
 /// interceptor
-
 int
 Worker::svc (void)
 {
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
index c2bf2000119..d137ab4288c 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Current_Test_Lib,
-           Client_ORBInitializer,
-           "$Id$")
-
 #include "Client_Request_Interceptor.h"
 #include "Client_ORBInitializer.h"
 
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
index 8a27b51a923..db233e7864e 100644
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ForwardRequest,
-           Client_Request_Interceptor,
-           "$Id$")
-
 #include "Current_TestC.h"
 #include "Client_Request_Interceptor.h"
 #include "Client_ORBInitializer.h"
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test.idl b/TAO/tests/TransportCurrent/lib/Current_Test.idl
index a7f00f7d29f..9d38734be71 100644
--- a/TAO/tests/TransportCurrent/lib/Current_Test.idl
+++ b/TAO/tests/TransportCurrent/lib/Current_Test.idl
@@ -13,8 +13,6 @@
  */
 //=============================================================================
 
-
-
 module Test
 {
   module Transport
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
index 8e866e97052..c8d3752852d 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Current_Test_Lib,
-           Server_ORBInitializer,
-           "$Id$")
-
 #include "Server_Request_Interceptor.h"
 #include "Server_ORBInitializer.h"
 
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
index 27b85d96434..13a739ca479 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Current_Test_Lib,
-           Server_Request_Interceptor,
-           "$Id$")
-
 #include "Server_Request_Interceptor.h"
 #include "Server_ORBInitializer.h"