ChangeLogTag:Sun Jan 30 19:57:37 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

23 files changed, 91 insertions, 17 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 22e125bfadd..69462824d67 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,5 +1,10 @@
 Sun Jan 30 19:57:37 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
+	* examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp:
+	* examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp:
+	* examples/Content_Server/AMI_Observer/Callback_i.cpp:
+	* examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp:
+	* examples/Content_Server/SMI_Iterator/client.cpp:
 	* orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
 	* orbsvcs/ImplRepo_Service/ImR_Activator_i.h:
 	* orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp:
@@ -7,6 +12,23 @@ Sun Jan 30 19:57:37 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 	* orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp:
 	* orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp:
 	* orbsvcs/orbsvcs/IFRService/RecursDef_i.h:
+	* orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h:
+	* orbsvcs/tests/FT_App/FT_TestReplica_i.h:
+	* orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h:
+	* orbsvcs/tests/FT_App/StubBatchConsumer.h:
+	* orbsvcs/tests/FT_App/StubFaultAnalyzer.h:
+	* orbsvcs/tests/FT_App/StubFaultConsumer.h:
+	* orbsvcs/tests/FT_App/StubFaultNotifier.h:
+	* orbsvcs/tests/FtRtEvent/consumer.cpp:
+	* orbsvcs/tests/FtRtEvent/supplier.cpp:
+	* performance-tests/RTCorba/Oneways/Reliable/client.cpp:
+	* performance-tests/Sequence_Latency/AMI/client.cpp:
+	* tests/Abstract_Interface/test_i.cpp:
+	* tests/Bug_1482_Regression/Hello.cpp:
+	* tests/DynAny_Test/test_dynenum.cpp:
+	* tests/DynAny_Test/test_dynsequence.cpp:
+	* tests/DynAny_Test/test_dynstruct.cpp:
+	* tests/DynAny_Test/test_dynunion.cpp:
 
 	  Added missing header include directives that are necessary due
 	  to inter-header dependency reductions in ACE.
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
index 6c7fe5c1e3a..214b818cfd3 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
@@ -7,8 +7,13 @@
 #include "Iterator_Factory_i.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_string.h"
+
+
+ACE_RCSID (AMI_Iterator,
+           Iterator_Factory_i,
+           "$Id$")
 
-ACE_RCSID (AMI_Iterator, Iterator_Factory_i, "$Id$")
 
 void
 Iterator_Factory_i::get_iterator (const char *pathname,
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
index df7814ef774..85f0cdd68fb 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
@@ -8,8 +8,13 @@
 #include "ace/Process_Manager.h"
 #include "Iterator_Handler.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_string.h"
+
+
+ACE_RCSID (AMI_Iterator,
+           Iterator_Handler,
+           "$Id$")
 
-ACE_RCSID(AMI_Iterator, Iterator_Handler, "$Id$")
 
 Iterator_Handler::Iterator_Handler (void)
   : file_ (ACE_sap_any_cast (const ACE_FILE_Addr &)),
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
index ad805c1bc48..15755e55328 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
@@ -8,8 +8,13 @@
 #include "ace/Process_Manager.h"
 #include "Callback_i.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_string.h"
+
+
+ACE_RCSID (AMI_Observer,
+           Callback_i,
+           "$Id$")
 
-ACE_RCSID (AMI_Observer, Callback_i, "$Id$")
 
 Callback_i::Callback_i (int *request_count)
   : file_ (ACE_sap_any_cast (ACE_FILE_Addr &)),
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
index 29e506d0c41..4b6f0db6c37 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
@@ -7,8 +7,13 @@
 #include "Callback_Handler.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_string.h"
+
+
+ACE_RCSID (AMI_Observer,
+           Push_Iterator_Factory_i,
+           "$Id$")
 
-ACE_RCSID (AMI_Observer, Push_Iterator_Factory_i, "$Id$")
 
 Web_Server::Metadata_Type *
 Push_Iterator_Factory_i::register_callback
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
index a5ec056cc20..dcec6b9a578 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
@@ -8,9 +8,11 @@
 #include "orbsvcs/CosNamingC.h"
 #include "Web_ServerC.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_string.h"
 
-ACE_RCSID (SMI_Iterator, 
-           client, 
+
+ACE_RCSID (SMI_Iterator,
+           client,
            "$Id$")
 
 
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index a2bc85e5f80..a87cb08afe6 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -30,6 +30,7 @@ class  FT_ReplicaFactory_i;
 #include <ace/Vector_T.h>
 #include "FT_TestReplicaS.h"
 #include <ace/Thread_Manager.h>
+#include <ace/SString.h>
 #include <orbsvcs/FT_ReplicationManagerC.h>
 
 /////////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
index 71d446852c6..77551ea21a0 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SString.h"
+
 #include "FT_TestReplicaS.h"
 
 ////////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index 0d0833f7755..6b45d786a6e 100755
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
@@ -13,6 +13,7 @@
 #include <orbsvcs/FT_NotifierC.h>
 #include <orbsvcs/FT_FaultDetectorFactoryC.h>
 #include <ace/Vector_T.h>
+#include <ace/SString.h>
 
 /////////////////////
 // Class declarations
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index d81d9fa061c..c766490fdfb 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -13,6 +13,8 @@
 #include <orbsvcs/CosNotifyChannelAdminS.h>
 #include <orbsvcs/FT_NotifierC.h>
 
+#include "ace/SString.h"
+
 //////////////////////
 // Forward references
 
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
index 7da34e52cba..2a5067ad4a2 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
@@ -16,6 +16,7 @@
 #include <orbsvcs/FT_FaultDetectorFactoryC.h>
 
 #include "ace/Vector_T.h"
+#include "ace/SString.h"
 
 //////////////////////
 // Forward references
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index 210570923f5..4e8603710e1 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -13,6 +13,9 @@
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include <orbsvcs/FT_NotifierC.h>
 
+#include "ace/SString.h"
+
+
 //////////////////////
 // Forward references
 
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index b939dbdf74b..612c5198fa1 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -14,6 +14,7 @@
 #include <orbsvcs/FT_NotifierS.h>
 #include <orbsvcs/FT_FaultDetectorFactoryC.h>
 #include <ace/Vector_T.h>
+#include <ace/SString.h>
 
 //////////////////////
 // Forward references
diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
index 8fabe5d60d4..7d2ee304899 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "PushConsumer.h"
 #include "ace/Get_Opt.h"
+#include "ace/Auto_Ptr.h"
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
 
@@ -15,7 +16,7 @@
 #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
 
 ACE_RCSID (FtRtEvent,
-           PushConsumer,
+           consumer,
            "$Id$")
 
 CORBA::ORB_var orb;
@@ -147,4 +148,3 @@ int main(int argc, ACE_TCHAR** argv)
 
   return 0;
 }
-
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index bd0b1bf3238..14a770b53be 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -3,6 +3,7 @@
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
 #include "PushSupplier.h"
 #include "ace/Get_Opt.h"
+#include "ace/Auto_Ptr.h"
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
 
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index 7f05eaffe9b..6ff62b839ee 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -9,6 +9,8 @@
 #include "ace/Stats.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/OS_NS_string.h"
+
 
 ACE_RCSID (Reliable,
            client,
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
index 7984c536efe..c1343244eab 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
@@ -7,8 +7,13 @@
 #include "ace/Sched_Params.h"
 #include "ace/Stats.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/OS_NS_string.h"
+
+
+ACE_RCSID (AMI,
+           client,
+           "$Id$")
 
-ACE_RCSID(AMI_Latency, client, "$Id$")
 
 const char *ior = "file://test.ior";
 
diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp
index 055be7b2c47..ac6c799d32b 100644
--- a/TAO/tests/Abstract_Interface/test_i.cpp
+++ b/TAO/tests/Abstract_Interface/test_i.cpp
@@ -1,12 +1,15 @@
 // $Id$
 
 #include "test_i.h"
+#include "ace/OS_NS_string.h"
 
-ACE_RCSID (Abstract_Interface, 
-           test_i, 
+
+ACE_RCSID (Abstract_Interface,
+           test_i,
            "$Id$")
 
-char * 
+
+char *
 foo_i::foo_op (const char * inarg
                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
@@ -29,7 +32,7 @@ foo_i::foo_op (const char * inarg
   return retval._retn ();
 }
 
-char * 
+char *
 foo_i::base_op (const char * inarg
                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
@@ -52,7 +55,7 @@ foo_i::base_op (const char * inarg
   return retval._retn ();
 }
 
-void 
+void
 passer_i::pass_ops (base_out outarg
                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
@@ -67,7 +70,7 @@ passer_i::pass_ops (base_out outarg
   ACE_CHECK;
 }
 
-void 
+void
 passer_i::pass_state (base_out outarg
                       ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((
@@ -101,4 +104,3 @@ passer_i::pass_state (base_out outarg
 
   outarg = tc._retn ();
 }
-
diff --git a/TAO/tests/Bug_1482_Regression/Hello.cpp b/TAO/tests/Bug_1482_Regression/Hello.cpp
index d8dca76fc9b..40d7a6c63e7 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1482_Regression/Hello.cpp
@@ -2,8 +2,13 @@
 // $Id$
 //
 #include "Hello.h"
+#include "ace/ACE.h"
+
+
+ACE_RCSID (Bug_1482_Regression,
+           Hello,
+           "$Id$")
 
-ACE_RCSID(Hello, Hello, "$Id$")
 
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index 4c867297a66..ddef182f80c 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -16,6 +16,7 @@
 #include "data.h"
 #include "tao/DynamicAny/DynamicAny.h"
 #include "analyzer.h"
+#include "ace/OS_NS_string.h"
 
 Test_DynEnum::Test_DynEnum (CORBA::ORB_var orb, int debug)
   : orb_ (orb),
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 9014e60d60e..94d1d20aae7 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -17,6 +17,7 @@
 #include "data.h"
 #include "tao/DynamicAny/DynamicAny.h"
 #include "analyzer.h"
+#include "ace/OS_NS_string.h"
 
 Test_DynSequence::Test_DynSequence (CORBA::ORB_var orb, int debug)
   : orb_ (orb),
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 57972b2391f..c5d5d9780e8 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -17,6 +17,7 @@
 #include "data.h"
 #include "tao/DynamicAny/DynamicAny.h"
 #include "analyzer.h"
+#include "ace/OS_NS_string.h"
 
 Test_DynStruct::Test_DynStruct (CORBA::ORB_var orb, int debug)
   : orb_ (orb),
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index a54cdb75d59..3de76b969e0 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -15,6 +15,7 @@
 #include "data.h"
 #include "tao/DynamicAny/DynamicAny.h"
 #include "analyzer.h"
+#include "ace/OS_NS_string.h"
 
 Test_DynUnion::Test_DynUnion (CORBA::ORB_var orb, int debug)
   : orb_ (orb),