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

5 files changed, 9 insertions, 16 deletions

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");