summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-04-05 17:55:46 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-04-05 17:55:46 +0000
commit23299fd8c77cdc7ddbf3937bb433c630d94e9d9b (patch)
treeeac753efa090d66d0db4b7ed5afd4128da637fac
parent5a75c49fe86990ed55756aa9d3f7996a3d26c97e (diff)
downloadATCD-23299fd8c77cdc7ddbf3937bb433c630d94e9d9b.tar.gz
Tue Apr 5 17:46:38 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--ChangeLog20
-rw-r--r--orbsvcs/Event_Service/Event_Service.cpp4
-rw-r--r--orbsvcs/orbsvcs/Daemon_Utilities.cpp4
-rw-r--r--orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/ECG_Adapters.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp3
-rw-r--r--orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp5
-rw-r--r--orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_And_Filter.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp3
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Dispatching.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp5
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Factory.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Filter.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Gateway.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp3
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp1
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp3
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp2
-rw-r--r--orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp4
-rw-r--r--orbsvcs/orbsvcs/Event_Utilities.cpp4
-rw-r--r--orbsvcs/orbsvcs/IOR_Multicast.cpp4
-rw-r--r--orbsvcs/orbsvcs/Naming/Naming_Client.cpp4
-rw-r--r--orbsvcs/orbsvcs/Runtime_Scheduler.cpp4
-rw-r--r--orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp2
-rw-r--r--orbsvcs/orbsvcs/Sched/DynSched.cpp2
-rw-r--r--orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp3
-rw-r--r--orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp4
-rw-r--r--orbsvcs/orbsvcs/Sched/SchedEntry.cpp2
-rw-r--r--orbsvcs/orbsvcs/Sched/Scheduler.cpp2
-rw-r--r--orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp2
-rw-r--r--orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp4
-rw-r--r--orbsvcs/orbsvcs/Scheduler_Factory.cpp4
-rw-r--r--orbsvcs/orbsvcs/Scheduler_Utilities.cpp3
-rw-r--r--orbsvcs/orbsvcs/Shutdown_Utilities.cpp4
-rw-r--r--orbsvcs/orbsvcs/Time_Utilities.cpp2
-rw-r--r--tao/BiDir_GIOP/BiDirGIOP.cpp4
-rw-r--r--tao/BiDir_GIOP/BiDirPolicy_Validator.cpp4
-rw-r--r--tao/BiDir_GIOP/BiDir_ORBInitializer.cpp4
-rw-r--r--tao/BiDir_GIOP/BiDir_PolicyFactory.cpp4
-rw-r--r--tao/BiDir_GIOP/BiDir_Policy_i.cpp4
-rw-r--r--tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp4
-rw-r--r--tao/CodecFactory/CDR_Encaps_Codec.cpp5
-rw-r--r--tao/CodecFactory/CodecFactory.cpp4
-rw-r--r--tao/CodecFactory/CodecFactory_impl.cpp4
-rw-r--r--tao/Messaging/AMI_Arguments_Converter_Impl.cpp4
-rw-r--r--tao/Messaging/Asynch_Invocation.cpp4
-rw-r--r--tao/Messaging/Asynch_Invocation_Adapter.cpp6
-rw-r--r--tao/Messaging/Asynch_Reply_Dispatcher.cpp2
-rw-r--r--tao/Messaging/Asynch_Timeout_Handler.cpp4
-rw-r--r--tao/Messaging/Buffering_Constraint_Policy.cpp4
-rw-r--r--tao/Messaging/Connection_Timeout_Policy_i.cpp5
-rw-r--r--tao/Messaging/ExceptionHolder_i.cpp4
-rw-r--r--tao/Messaging/Messaging.cpp4
-rw-r--r--tao/Messaging/Messaging_Loader.cpp3
-rw-r--r--tao/Messaging/Messaging_ORBInitializer.cpp4
-rw-r--r--tao/Messaging/Messaging_PolicyFactory.cpp4
-rw-r--r--tao/Messaging/Messaging_Policy_i.cpp4
-rw-r--r--tao/Messaging/Messaging_Queueing_Strategies.cpp5
-rw-r--r--tao/PI/ClientRequestDetails.cpp4
-rw-r--r--tao/PI/ClientRequestInfo.cpp4
-rw-r--r--tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp4
-rw-r--r--tao/PI/ClientRequestInterceptor_Factory_Impl.cpp4
-rw-r--r--tao/PI/DLL_Resident_ORB_Initializer.cpp4
-rw-r--r--tao/PI/ORBInitInfo.cpp4
-rw-r--r--tao/PI/ORBInitializer_Registry_Impl.cpp5
-rw-r--r--tao/PI/PI.cpp4
-rw-r--r--tao/PI/PICurrent.cpp4
-rw-r--r--tao/PI/PICurrent_Impl.cpp4
-rw-r--r--tao/PI/PICurrent_Loader.cpp4
-rw-r--r--tao/PI/PI_ORBInitializer.cpp4
-rw-r--r--tao/PI/PI_PolicyFactory.cpp4
-rw-r--r--tao/PI/PolicyFactory_Loader.cpp4
-rw-r--r--tao/PI/PolicyFactory_Registry.cpp5
-rw-r--r--tao/PI/ProcessingModePolicy.cpp4
-rw-r--r--tao/PI/RequestInfo_Util.cpp4
-rw-r--r--tao/PI/RequestInterceptor_Adapter_Impl.cpp4
-rw-r--r--tao/Valuetype/AbstractBase_Invocation_Adapter.cpp4
-rw-r--r--tao/Valuetype/ValueBase.cpp4
-rw-r--r--tao/Valuetype/ValueFactory.cpp4
-rw-r--r--tao/Valuetype/ValueFactory_Map.cpp4
-rw-r--r--tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp4
-rw-r--r--tao/Valuetype/Valuetype_Adapter_Impl.cpp5
137 files changed, 22 insertions, 436 deletions
diff --git a/ChangeLog b/ChangeLog
index a56aea5763c..004cce93d83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Tue Apr 5 17:46:38 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * tao/BiDir_GIOP/*.cpp:
+ * tao/CodecFactory/*.cpp:
+ * tao/Messaging/*.cpp:
+ * tao/PI/*.cpp:
+ * tao/ValueType/*.cpp:
+ * orbsvcs/orbsvcs/*.cpp:
+ * orbsvcs/orbsvcs/Event/*.cpp:
+ * orbsvcs/orbsvcs/Sched/*.cpp:
+ * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp:
+ * orbsvcs/orbsvcs/Naming/Naming_Client.cpp:
+
+ - Removed ACE_RCSID macros from non-generated source files.
+ - Changed 'ACE_AUTO_PTR_RESET' to 'ACE_auto_ptr_reset' and modified signature
+ - Updated #includes to reflect ACE changes
+
Tue Apr 5 16:50:23 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>
* tao/*.cpp:
@@ -7,7 +24,8 @@ Tue Apr 5 16:50:23 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/be/be_visitor_array/array_ch.cpp:
* TAO_IDL/util/utl_indenter.cpp:
- Removed ACE_RCSID macros.
+ - Removed ACE_RCSID macros from non-generated source files.
+ - Changed 'ACE_AUTO_PTR_RESET' to 'ACE_auto_ptr_reset' and modified signature
* TAO_IDL/be/be_codegen.cpp:
* TAO_IDL/be/be_interface.cpp:
diff --git a/orbsvcs/Event_Service/Event_Service.cpp b/orbsvcs/Event_Service/Event_Service.cpp
index a839101ae39..d2e04683981 100644
--- a/orbsvcs/Event_Service/Event_Service.cpp
+++ b/orbsvcs/Event_Service/Event_Service.cpp
@@ -20,10 +20,6 @@
#include "tao/BiDir_GIOP/BiDirGIOP.h"
#include "ace/OS_NS_strings.h"
-ACE_RCSID (Event_Service,
- Event_Service,
- "$Id$")
-
int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
bool use_thread_per_consumer = false;
diff --git a/orbsvcs/orbsvcs/Daemon_Utilities.cpp b/orbsvcs/orbsvcs/Daemon_Utilities.cpp
index 79531a513bc..0c634b97244 100644
--- a/orbsvcs/orbsvcs/Daemon_Utilities.cpp
+++ b/orbsvcs/orbsvcs/Daemon_Utilities.cpp
@@ -4,10 +4,6 @@
#include "ace/Arg_Shifter.h"
#include "ace/ACE.h"
-ACE_RCSID(orbsvcs,
- Daemon_Utilities,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
void TAO_Daemon_Utility::check_for_daemon (int &argc, ACE_TCHAR* argv[])
diff --git a/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp b/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
index 18415bd9fc0..8a6ab4da092 100644
--- a/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
+++ b/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
@@ -9,6 +9,4 @@
#include "orbsvcs/ESF/ESF_RefCount_Guard.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(ESF, ESF_RefCount_Guard, "$Id$")
-
#endif /* TAO_ESF_REFCOUNT_GUARD_CPP */
diff --git a/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp b/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
index 8813fee591c..50df688ca02 100644
--- a/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
@@ -2,10 +2,6 @@
#include "orbsvcs/Event/ECG_Adapters.h"
-ACE_RCSID (Event,
- ECG_Adapters,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown (void)
diff --git a/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
index 8f26a1bc535..6a6c0d61941 100644
--- a/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
@@ -13,10 +13,6 @@
#include "orbsvcs/Event/ECG_CDR_Message_Receiver.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Event,
- ECG_CDR_Message_Receiver,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_ECG_CDR_Processor::~TAO_ECG_CDR_Processor (void)
diff --git a/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index 8a241a85c17..5f9b89f50d0 100644
--- a/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -10,8 +10,6 @@
#include "orbsvcs/Event/ECG_CDR_Message_Sender.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, ECG_CDR_Message_Sender, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
void
diff --git a/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
index c093e008c15..d36aef388e9 100644
--- a/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
@@ -2,8 +2,6 @@
#include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
-ACE_RCSID(Event, ECG_ConsumerEventChannelControl, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control (void)
diff --git a/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index f32f797fe64..782ec254779 100644
--- a/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -13,8 +13,6 @@
#include "orbsvcs/Event/ECG_Mcast_EH.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, ECG_Mcast_EH, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_Dgram_Handler *recv,
diff --git a/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index 5fc0d7271d2..1a780fcb1c5 100644
--- a/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -20,9 +20,6 @@
#include "orbsvcs/Event/ECG_Mcast_Gateway.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, ECG_Mcast_Gateway, "$Id$")
-
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
typedef TAO_EC_Shutdown_Command<TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> >
diff --git a/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
index c77b7331d64..650d4e4b034 100644
--- a/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
@@ -7,8 +7,6 @@
#include "ace/Reactor.h"
-ACE_RCSID(Event, ECG_Reactive_ConsumerEventChannelControl, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_ECG_Reactive_ConsumerEC_Control::
diff --git a/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
index 22d83c7e30d..35953788cf0 100644
--- a/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
@@ -6,8 +6,6 @@
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
-ACE_RCSID(Event, ECG_Reconnect_ConsumerEventChannelControl, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_ECG_Reconnect_ConsumerEC_Control::
diff --git a/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
index 213e0ea32dc..fb084a0f08c 100644
--- a/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
@@ -8,8 +8,6 @@
#include "orbsvcs/Event/ECG_UDP_EH.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, ECG_UDP_EH, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_ECG_UDP_EH::TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv)
diff --git a/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
index a201234c375..08473e9ffe7 100644
--- a/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
@@ -9,8 +9,6 @@
#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, ECG_UDP_Out_Endpoint, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint (void)
diff --git a/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 0f2be3c8f2d..a96ad458bfb 100644
--- a/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -8,11 +8,6 @@
#include "orbsvcs/Event/ECG_UDP_Receiver.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Event,
- ECG_UDP_Receiver,
- "$Id$")
-
-
// ****************************************************************
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
index 178c597907e..ee806ec09d6 100644
--- a/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
@@ -17,10 +17,6 @@
#include "orbsvcs/Event/ECG_UDP_Sender.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Event,
- ECG_UDP_Sender,
- "$Id$")
-
// ****************************************************************
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index 335f20b9854..cc0d14b9d5b 100644
--- a/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -2,8 +2,6 @@
#include "orbsvcs/Event/EC_And_Filter.h"
-ACE_RCSID(Event, EC_And_Filter, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_And_Filter::TAO_EC_And_Filter (TAO_EC_Filter* children[],
diff --git a/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 9ca34c2bc9e..9dce3bc79f0 100644
--- a/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -20,10 +20,6 @@
#include "tao/ORB_Core.h"
-ACE_RCSID (Event,
- EC_Basic_Factory,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Basic_Factory::TAO_EC_Basic_Factory (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index a7a0074ef56..6d44a43ecff 100644
--- a/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -15,9 +15,6 @@
#include "orbsvcs/Event/EC_Basic_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Basic_Filter_Builder, "$Id$")
-
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
index 2395bed2de1..a51e58ca4a0 100644
--- a/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
@@ -2,8 +2,6 @@
#include "orbsvcs/Event/EC_Bitmask_Filter.h"
-ACE_RCSID(Event, EC_Bitmask_Filter, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Bitmask_Filter::TAO_EC_Bitmask_Filter (CORBA::ULong source_mask,
diff --git a/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index cce53603fd0..f02189ec05e 100644
--- a/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -2,8 +2,6 @@
#include "orbsvcs/Event/EC_Conjunction_Filter.h"
-ACE_RCSID(Event, EC_Conjunction_Filter, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
const int bits_per_word = sizeof(TAO_EC_Conjunction_Filter::Word) * CHAR_BIT;
diff --git a/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index 8c7026d2c59..a6f15eac907 100644
--- a/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -8,10 +8,6 @@
#include "orbsvcs/ESF/ESF_Peer_Admin.h"
#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
-ACE_RCSID (Event,
- EC_ConsumerAdmin,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec)
diff --git a/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
index f037ca17b53..0b7607696d3 100644
--- a/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -2,8 +2,6 @@
#include "orbsvcs/Event/EC_ConsumerControl.h"
-ACE_RCSID(Event, EC_ConsumerControl, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_ConsumerControl::TAO_EC_ConsumerControl (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index 90b03525203..910ff83354f 100644
--- a/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -39,8 +39,6 @@
#include "orbsvcs/Event/EC_Default_Factory.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Default_Factory, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Default_Factory::~TAO_EC_Default_Factory (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
index a46b275b1bc..aba1ac7ce46 100644
--- a/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
@@ -4,9 +4,7 @@
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
#include "orbsvcs/Event/EC_Supplier_Filter.h"
-#include "ace/Synch_T.h"
-
-ACE_RCSID(Event, EC_Default_ProxyConsumer, "$Id$")
+#include "ace/Reverse_Lock_T.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
index 0944fa6ca7a..487252bc101 100644
--- a/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
@@ -6,10 +6,6 @@
#include "ace/Reverse_Lock_T.h"
-ACE_RCSID (Event,
- EC_ProxySupplier,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
diff --git a/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index 51b47cc607c..dd04473ef59 100644
--- a/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -2,8 +2,6 @@
#include "orbsvcs/Event/EC_Disjunction_Filter.h"
-ACE_RCSID(Event, EC_Disjunction_Filter, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Disjunction_Filter::
diff --git a/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
index 4e2ead6d6e1..3beaffca0e8 100644
--- a/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
@@ -3,8 +3,6 @@
#include "orbsvcs/Event/EC_Dispatching.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
-ACE_RCSID(Event, EC_Dispatching, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Dispatching::~TAO_EC_Dispatching (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index dceb0b1c894..18d5024f68c 100644
--- a/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -12,11 +12,6 @@
#include "orbsvcs/Event/EC_Dispatching_Task.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Event,
- EC_Dispatching,
- "$Id$")
-
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
index b35602065d0..e8dd40520b6 100644
--- a/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -4,8 +4,6 @@
#include "orbsvcs/Event/EC_Default_Factory.h"
#include "ace/Dynamic_Service.h"
-ACE_RCSID(Event, EC_Event_Channel, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Event_Channel::
diff --git a/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
index 4a04c8d1050..117f06fad6c 100644
--- a/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
@@ -14,8 +14,6 @@
#include "orbsvcs/Event/EC_Event_Channel_Base.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Event_Channel_Base, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Event_Channel_Base::
diff --git a/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/orbsvcs/orbsvcs/Event/EC_Factory.cpp
index 1a5cebd8ecd..58e3743268b 100644
--- a/orbsvcs/orbsvcs/Event/EC_Factory.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Factory.cpp
@@ -3,8 +3,6 @@
#include "orbsvcs/Event/EC_Factory.h"
#include "ace/Dynamic_Service.h"
-ACE_RCSID(Event, EC_Factory, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_RTEvent_Serv_Export unsigned short TAO_EC_debug_level;
diff --git a/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Filter.cpp
index ef641d07bbf..94628a5ff5a 100644
--- a/orbsvcs/orbsvcs/Event/EC_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Filter.cpp
@@ -9,10 +9,6 @@
#include "orbsvcs/Event/EC_Filter.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Event,
- EC_Filter,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Filter::~TAO_EC_Filter (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
index f06edd5439c..06d95f6aed2 100644
--- a/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
@@ -7,8 +7,6 @@
#include "orbsvcs/Event/EC_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Filter_Builder, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Filter_Builder::~TAO_EC_Filter_Builder (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
index 8addbb46165..01c0f5c1e8c 100644
--- a/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -2,10 +2,6 @@
#include "orbsvcs/Event/EC_Gateway.h"
-ACE_RCSID (Event,
- EC_Gateway,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Gateway::TAO_EC_Gateway (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index d7ce4d4027e..da4bc1fee2b 100644
--- a/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -10,10 +10,6 @@
#include "ace/Dynamic_Service.h"
-ACE_RCSID (Event,
- EC_Gateway_IIOP,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index 89f3e1da43e..b1711600126 100644
--- a/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -18,10 +18,6 @@
#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Event,
- EC_Gateway_IIOP_Factory,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
int
diff --git a/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
index 319d1167fad..9cc898d7698 100644
--- a/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
@@ -3,10 +3,6 @@
#include "orbsvcs/Event/EC_Gateway_Sched.h"
#include "orbsvcs/Time_Utilities.h"
-ACE_RCSID (Event,
- EC_Gateway_sched,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Gateway_Sched::TAO_EC_Gateway_Sched (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
index 8d701f9f8fb..e3a65a5a7b6 100644
--- a/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
@@ -8,8 +8,6 @@
#include "orbsvcs/Event/EC_Group_Scheduling.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Group_Scheduling, "$Id$")
-
void
TAO_EC_Group_Scheduling::add_proxy_supplier_dependencies (
TAO_EC_ProxyPushSupplier *,
diff --git a/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index eed91d2c9f0..fe1855d841c 100644
--- a/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -2,9 +2,6 @@
#include "orbsvcs/Event/EC_MT_Dispatching.h"
-ACE_RCSID(Event, EC_MT_Dispatching, "$Id$")
-
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads,
diff --git a/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
index d808e1bbac2..7181c8eb645 100644
--- a/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -2,8 +2,6 @@
#include "orbsvcs/Event/EC_Masked_Type_Filter.h"
-ACE_RCSID(Event, EC_Masked_Type_Filter, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Masked_Type_Filter::
diff --git a/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index 577da9bf02f..9082e41c54e 100644
--- a/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -2,8 +2,6 @@
#include "orbsvcs/Event/EC_Negation_Filter.h"
-ACE_RCSID(Event, EC_Negation_Filter, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Negation_Filter::TAO_EC_Negation_Filter (TAO_EC_Filter* child)
diff --git a/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index 58607107d24..b76194a39ef 100644
--- a/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -19,8 +19,6 @@
#include "tao/ORB_Core.h"
-ACE_RCSID(Event, EC_Null_Factory, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Null_Factory::TAO_EC_Null_Factory (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index dace85bf437..af12eff6d23 100644
--- a/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -8,8 +8,6 @@
#include "orbsvcs/Event/EC_Null_Scheduling.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Null_Scheduling, "$Id$")
-
void
TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies (
TAO_EC_ProxyPushSupplier *,
diff --git a/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 1330d475a8f..89953063efa 100644
--- a/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -13,8 +13,6 @@
#include "orbsvcs/Event/EC_ObserverStrategy.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_ObserverStrategy, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 8dcc1ab52a0..1f584e472ce 100644
--- a/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -15,8 +15,6 @@
#include "orbsvcs/Event/EC_Per_Supplier_Filter.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Per_Supplier_Filter, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Per_Supplier_Filter::
diff --git a/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index 3d36e3c9880..3104c55b567 100644
--- a/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -15,8 +15,6 @@
#include "orbsvcs/Event/EC_Prefix_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Prefix_Filter_Builder, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index f44f34ba32c..3133633764b 100644
--- a/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -10,8 +10,6 @@
#include "ace/Sched_Params.h"
-ACE_RCSID(Event, EC_Priority_Dispatching, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_Base *ec)
diff --git a/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
index 555fd172947..e002611e1bf 100644
--- a/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -10,8 +10,6 @@
#include "orbsvcs/Event/EC_Priority_Scheduling.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Priority_Scheduling, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index c05b97b6cc5..b90a69fef5c 100644
--- a/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -11,10 +11,6 @@
#include "orbsvcs/Event/EC_ProxyConsumer.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Event,
- EC_ProxyConsumer,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
diff --git a/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 6243bc26558..feaa1099b1b 100644
--- a/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -17,10 +17,6 @@
#include "orbsvcs/Event/EC_ProxySupplier.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Event,
- EC_ProxySupplier,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
diff --git a/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp b/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
index 1e39f9bb795..085b3d42b40 100644
--- a/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
@@ -6,4 +6,3 @@
#include "orbsvcs/Event/EC_QOS_Info.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_QOS_Info, "$Id$")
diff --git a/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index d828e4818df..aea5505840c 100644
--- a/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -15,8 +15,6 @@
#include "orbsvcs/Event/EC_Reactive_ConsumerControl.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Reactive_ConsumerControl, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Reactive_ConsumerControl::
diff --git a/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
index bffad152a77..bfcab7c04b9 100644
--- a/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
@@ -3,8 +3,6 @@
#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
-ACE_RCSID(Event, EC_Reactive_Dispatching, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index e5736124efd..1320229d581 100644
--- a/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -15,8 +15,6 @@
#include "orbsvcs/Event/EC_Reactive_SupplierControl.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Reactive_SupplierControl, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Reactive_SupplierControl::
diff --git a/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
index fbdfb022768..9df36523c84 100644
--- a/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
@@ -3,10 +3,6 @@
#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h"
#include "ace/Reactor.h"
-ACE_RCSID (Event,
- EC_Reactive_Timeout_Generator,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Reactive_Timeout_Generator::
diff --git a/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
index 1f310ff9de8..4ae506f4742 100644
--- a/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
@@ -15,8 +15,6 @@
#include "orbsvcs/Event/EC_Sched_Factory.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Sched_Factory, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index 82910313264..ad650e2df81 100644
--- a/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -4,8 +4,6 @@
#include "orbsvcs/Event/EC_QOS_Info.h"
#include "ace/Log_Msg.h"
-ACE_RCSID(Event, EC_Sched_Filter, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Sched_Filter::
diff --git a/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index a024c3a449a..9cbb7f865aa 100644
--- a/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -14,9 +14,6 @@
#include "orbsvcs/Event/EC_Sched_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Sched_Filter_Builder, "$Id$")
-
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
index 76be60d02ec..a931a68578d 100644
--- a/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
@@ -3,8 +3,6 @@
#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
-ACE_RCSID(Event, EC_Scheduling_Strategy, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index 1b2f58cd72e..e2d1a4b4608 100644
--- a/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -8,8 +8,6 @@
#include "orbsvcs/ESF/ESF_Peer_Admin.h"
#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
-ACE_RCSID(Event, EC_SupplierAdmin, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base *ec)
diff --git a/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
index 3b9fa1c3563..3559f8845df 100644
--- a/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -2,8 +2,6 @@
#include "orbsvcs/Event/EC_SupplierControl.h"
-ACE_RCSID(Event, EC_SupplierControl, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_SupplierControl::TAO_EC_SupplierControl (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
index dfe1f96394d..14c924048d3 100644
--- a/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
@@ -8,8 +8,6 @@
#include "orbsvcs/Event/EC_Supplier_Filter.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Supplier_Filter, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
index 63203a004fa..401bde143ef 100644
--- a/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
@@ -2,8 +2,6 @@
#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
-ACE_RCSID(Event, EC_Supplier_Filter_Builder, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index 1137af088b0..fdab71df99b 100644
--- a/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -5,8 +5,6 @@
#include <ace/Dynamic_Service.h>
-ACE_RCSID(Event, EC_TPC_Dispatching, "$Id$")
-
#if !defined(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE)
#define TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE 32
#endif
diff --git a/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
index 3fa0682b367..384e9205880 100644
--- a/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
@@ -12,8 +12,6 @@
#include "ace/Sched_Params.h"
#include "ace/OS_NS_strings.h"
-ACE_RCSID(Event, EC_TPC_Factory, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
unsigned long TAO_EC_TPC_debug_level;
diff --git a/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index c80be748333..1e46cb97fd1 100644
--- a/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -2,8 +2,6 @@
#include "orbsvcs/Event/EC_TPC_ProxyConsumer.h"
-ACE_RCSID(Event, EC_TPC_ProxyConsumer, "$Id$")
-
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_TPC_Dispatching.h"
diff --git a/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index 09cc25296ee..85aa3c70c77 100644
--- a/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -6,8 +6,6 @@
#include "orbsvcs/Event/EC_TPC_ProxySupplier.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_TPC_ProxySupplier, "$Id$")
-
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_TPC_Dispatching.h"
diff --git a/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
index bc3a9cc1947..8dc4ef63332 100644
--- a/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
@@ -8,8 +8,6 @@
#include "ace/Log_Msg.h"
#include "ace/Sched_Params.h"
-ACE_RCSID(Event, EC_Thread_Flags , "$Id$")
-
#define TETFSF(flag) { #flag, flag }
TAO_EC_Thread_Flags::Supported_Flag TAO_EC_Thread_Flags::supported_flags_[] = {
#if defined (ACE_HAS_THREADS)
diff --git a/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index 8191211f5bc..9af62d1d36a 100644
--- a/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -11,10 +11,6 @@
#include "orbsvcs/Event/EC_Timeout_Filter.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Event,
- EC_Timeout_Filter,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Timeout_Filter::TAO_EC_Timeout_Filter (
diff --git a/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index fda4db5e345..ac71b746fd5 100644
--- a/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -8,10 +8,6 @@
#include "orbsvcs/Event/EC_Timeout_Generator.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Event,
- EC_Timeout_Generator,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index 93f1264d176..65609ef69ff 100644
--- a/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -8,8 +8,6 @@
#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
#include "orbsvcs/Event/EC_ProxyConsumer.h" // @@ MSVC 6 bug
-ACE_RCSID(Event, EC_Trivial_Supplier_Filter, "$Id$")
-
// ****************************************************************
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index 6b158f213cf..a13f0183f36 100644
--- a/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -2,8 +2,6 @@
#include "orbsvcs/Event/EC_Type_Filter.h"
-ACE_RCSID(Event, EC_Type_Filter, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header)
diff --git a/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
index 51438a687d2..2700fcc4d22 100644
--- a/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -3,10 +3,6 @@
#include "orbsvcs/Event/EC_UDP_Admin.h"
#include "ace/INET_Addr.h"
-ACE_RCSID (Event,
- EC_UDP_Admin,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_EC_Simple_AddrServer::TAO_EC_Simple_AddrServer (CORBA::UShort port)
diff --git a/orbsvcs/orbsvcs/Event_Utilities.cpp b/orbsvcs/orbsvcs/Event_Utilities.cpp
index 10675726fff..9e4a7b24ea0 100644
--- a/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -9,10 +9,6 @@
#include "orbsvcs/Event_Utilities.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (orbsvcs,
- Event_Utilities,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ConsumerQOS_Factory::
diff --git a/orbsvcs/orbsvcs/IOR_Multicast.cpp b/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 747a031b5ce..55c3adf82d4 100644
--- a/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -7,10 +7,6 @@
#include "ace/SOCK_Connector.h"
#include "ace/Log_Msg.h"
-ACE_RCSID (orbsvcs,
- IOR_Multicast,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_HANDLE
diff --git a/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
index ee5a710de0d..08bcaee49f2 100644
--- a/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
+++ b/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
@@ -4,10 +4,6 @@
#include "orbsvcs/CosNamingC.h"
#include "ace/Log_Msg.h"
-ACE_RCSID (Naming,
- Naming_Client,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
CosNaming::NamingContext_ptr
diff --git a/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 951b36935ca..ecb9cbfd20e 100644
--- a/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -4,10 +4,6 @@
#include "orbsvcs/Runtime_Scheduler.h"
#include "ace/OS_NS_string.h"
-ACE_RCSID (orbsvcs,
- Runtime_Scheduler,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Constructor. Initialize the data from the POD_RT_Info array.
diff --git a/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index 76155111d65..c1e5d7aa9ac 100644
--- a/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -9,8 +9,6 @@
#include "orbsvcs/Sched/Config_Scheduler.h"
-ACE_RCSID(Sched, Config_Scheduler, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_Config_Scheduler::ACE_Config_Scheduler (void)
diff --git a/orbsvcs/orbsvcs/Sched/DynSched.cpp b/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 14727adb81d..f8d35344158 100644
--- a/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -21,8 +21,6 @@
#include "orbsvcs/Sched/DynSched.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Sched, DynSched, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
//////////////////////
diff --git a/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index 8ff73d87e6b..7fc84f72aca 100644
--- a/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ b/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
@@ -18,9 +18,6 @@
#include "orbsvcs/Time_Utilities.h"
-
-ACE_RCSID (Sched, Reconfig_Sched_Utils, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
///////////////////////////
diff --git a/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index 9a3671673e2..e7052c5f0dc 100644
--- a/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -209,7 +209,7 @@ init (int config_count,
CORBA::NO_MEMORY ());
// Make sure the new config info is cleaned up if we exit abruptly.
- ACE_AUTO_PTR_RESET (new_config_info_ptr, new_config_info, RtecScheduler::Config_Info);
+ ACE_auto_ptr_reset (new_config_info_ptr, new_config_info);
result = config_info_map_.bind (config_info [i].preemption_priority,
new_config_info);
@@ -2539,7 +2539,7 @@ assign_priorities_i (void)
CORBA::NO_MEMORY ());
// Make sure the new config info is cleaned up if we exit abruptly.
- ACE_AUTO_PTR_RESET (new_config_info_ptr, new_config_info, RtecScheduler::Config_Info);
+ ACE_auto_ptr_reset (new_config_info_ptr, new_config_info);
// Have the strategy fill in the new config info for that
// priority level, using the representative scheduling entry.
diff --git a/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index 6cb44d2889c..ec93af8e7b5 100644
--- a/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -18,8 +18,6 @@
#include "orbsvcs/Sched/SchedEntry.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Sched, SchedEntry, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
Task_Entry::Task_Entry (void)
diff --git a/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 3e6bdb356bc..24818216453 100644
--- a/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -16,8 +16,6 @@
#include "ace/Lock_Adapter_T.h"
-ACE_RCSID(Sched, Scheduler, "$Id$")
-
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// class Scheduler static members
diff --git a/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
index 03e28d3b35b..118f0848df0 100644
--- a/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -14,8 +14,6 @@
#include "orbsvcs/Sched/Scheduler_Generic.h"
#include "ace/OS_NS_stdio.h"
-ACE_RCSID(Sched, Scheduler_Generic, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
///////////////////////////////////////////////////////////////////////////////
diff --git a/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index 51dd6770814..50b4d4a843e 100644
--- a/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -12,10 +12,6 @@
#include "orbsvcs/Sched/Strategy_Scheduler.h"
#include "ace/Sched_Params.h"
-ACE_RCSID (Sched,
- Strategy_Scheduler,
- "$Id$")
-
//////////////////////////////////////////////
// Helper function type definition for sort //
//////////////////////////////////////////////
diff --git a/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 668e47b5474..7aefb40796c 100644
--- a/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -13,10 +13,6 @@
#include "orbsvcs/Scheduler_Factory.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(orbsvcs,
- Scheduler_Factory,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Initialize static class members.
diff --git a/orbsvcs/orbsvcs/Scheduler_Utilities.cpp b/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
index 5d703e0e7cf..91bd0d15e32 100644
--- a/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
+++ b/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
@@ -6,7 +6,4 @@
#include "orbsvcs/Scheduler_Utilities.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (orbsvcs,
- Scheduler_Utilities,
- "$Id$")
diff --git a/orbsvcs/orbsvcs/Shutdown_Utilities.cpp b/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
index 0215b3ac111..f4e8c0e1f43 100644
--- a/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
+++ b/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
@@ -3,10 +3,6 @@
#include "orbsvcs/Shutdown_Utilities.h"
#include "ace/Log_Msg.h"
-ACE_RCSID(orbsvcs,
- Shutdown_Utilities,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
Service_Shutdown::Service_Shutdown (Shutdown_Functor& sf)
diff --git a/orbsvcs/orbsvcs/Time_Utilities.cpp b/orbsvcs/orbsvcs/Time_Utilities.cpp
index f7004fab47c..4b7d1280b59 100644
--- a/orbsvcs/orbsvcs/Time_Utilities.cpp
+++ b/orbsvcs/orbsvcs/Time_Utilities.cpp
@@ -6,8 +6,6 @@
# include "orbsvcs/Time_Utilities.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(orbsvcs, Time_Utilities, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Number of nanoseconds between CORBA and POSIX epochs.
diff --git a/tao/BiDir_GIOP/BiDirGIOP.cpp b/tao/BiDir_GIOP/BiDirGIOP.cpp
index 93eeb28ba20..90c4c1fa166 100644
--- a/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -6,10 +6,6 @@
#include "tao/ORBInitializer_Registry.h"
#include "ace/CORBA_macros.h"
-ACE_RCSID (BiDir_GIOP,
- BiDirGIOP,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_BiDirGIOP_Loader::TAO_BiDirGIOP_Loader (void)
diff --git a/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
index d0bff88c6b7..6ea3680fa3a 100644
--- a/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
+++ b/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
@@ -3,10 +3,6 @@
#include "tao/Policy_Set.h"
#include "tao/ORB_Core.h"
-ACE_RCSID (BiDir_GIOP,
- BiDirPolicy_Validator,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_BiDirPolicy_Validator::TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core)
diff --git a/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
index 1ec6cfcbed0..9de4075a3ab 100644
--- a/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
+++ b/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
@@ -11,10 +11,6 @@
#include "ace/CORBA_macros.h"
-ACE_RCSID (BiDir_GIOP,
- BiDir_ORBInitializer,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
void
diff --git a/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
index 03559f68670..8c825ec56da 100644
--- a/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ b/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
@@ -7,10 +7,6 @@
#include "ace/CORBA_macros.h"
-ACE_RCSID (BiDir_GIOP,
- BiDir_PolicyFactory,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
CORBA::Policy_ptr
diff --git a/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/tao/BiDir_GIOP/BiDir_Policy_i.cpp
index 00b87d8026d..cd328dc8a56 100644
--- a/tao/BiDir_GIOP/BiDir_Policy_i.cpp
+++ b/tao/BiDir_GIOP/BiDir_Policy_i.cpp
@@ -8,10 +8,6 @@
#include "ace/CORBA_macros.h"
-ACE_RCSID (BiDir_GIOP,
- BiDir_Policy_i,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (
diff --git a/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp b/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp
index 556ca10a793..5427b3b93ef 100644
--- a/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp
+++ b/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp
@@ -2,10 +2,6 @@
#include "tao/BiDir_GIOP/BiDir_Service_Context_Handler.h"
-ACE_RCSID (BiDir_GIOP,
- BiDir_Service_Context_Handler,
- "$Id$")
-
#include "tao/CDR.h"
#include "tao/TAO_Server_Request.h"
#include "tao/Transport.h"
diff --git a/tao/CodecFactory/CDR_Encaps_Codec.cpp b/tao/CodecFactory/CDR_Encaps_Codec.cpp
index 3fed35012b5..0a70c79e587 100644
--- a/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -18,11 +18,6 @@
#include "ace/OS_NS_string.h"
#include "ace/CORBA_macros.h"
-
-ACE_RCSID (CodecFactory,
- CDR_Encaps_Codec,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec (
diff --git a/tao/CodecFactory/CodecFactory.cpp b/tao/CodecFactory/CodecFactory.cpp
index f567c008cc7..f1431a88da9 100644
--- a/tao/CodecFactory/CodecFactory.cpp
+++ b/tao/CodecFactory/CodecFactory.cpp
@@ -14,10 +14,6 @@
#include "tao/ORB.h"
#include "tao/debug.h"
-ACE_RCSID (CodecFactory,
- CodecFactory,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
CORBA::Object_ptr
diff --git a/tao/CodecFactory/CodecFactory_impl.cpp b/tao/CodecFactory/CodecFactory_impl.cpp
index 1e27c3affe9..4953fc4543f 100644
--- a/tao/CodecFactory/CodecFactory_impl.cpp
+++ b/tao/CodecFactory/CodecFactory_impl.cpp
@@ -11,10 +11,6 @@
#include "ace/Codeset_Symbols.h"
#include "ace/CORBA_macros.h"
-ACE_RCSID (CodecFactory_impl,
- CodecFactory,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_CodecFactory::TAO_CodecFactory (TAO_ORB_Core * orb_core)
diff --git a/tao/Messaging/AMI_Arguments_Converter_Impl.cpp b/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
index 021fcc69a3b..59362352907 100644
--- a/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
+++ b/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
@@ -6,10 +6,6 @@
#include "tao/Reply_Dispatcher.h"
#include "tao/CDR.h"
-ACE_RCSID (Messaging,
- AMI_Arguments_Converter_Impl,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
void
diff --git a/tao/Messaging/Asynch_Invocation.cpp b/tao/Messaging/Asynch_Invocation.cpp
index 7243dc28e76..99fa8285f12 100644
--- a/tao/Messaging/Asynch_Invocation.cpp
+++ b/tao/Messaging/Asynch_Invocation.cpp
@@ -16,10 +16,6 @@
# include "tao/PortableInterceptorC.h"
#endif /*TAO_HAS_INTERCEPTORS */
-ACE_RCSID (Messaging,
- Asynch_Invocation,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/tao/Messaging/Asynch_Invocation_Adapter.cpp b/tao/Messaging/Asynch_Invocation_Adapter.cpp
index 920493700b0..65eeec1505f 100644
--- a/tao/Messaging/Asynch_Invocation_Adapter.cpp
+++ b/tao/Messaging/Asynch_Invocation_Adapter.cpp
@@ -15,12 +15,6 @@
#include "tao/Thread_Lane_Resources.h"
#include "tao/GIOP_Utils.h"
-
-ACE_RCSID (Messaging,
- Asynch_Invocation_Adapter,
- "$Id$")
-
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/tao/Messaging/Asynch_Reply_Dispatcher.cpp
index 2f8e3280727..d531b2028b5 100644
--- a/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -8,8 +8,6 @@
#include "tao/ORB_Core.h"
#include "tao/Transport.h"
-ACE_RCSID(Messaging, Asynch_Reply_Dispatcher, "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Constructor.
diff --git a/tao/Messaging/Asynch_Timeout_Handler.cpp b/tao/Messaging/Asynch_Timeout_Handler.cpp
index eaff4d4de82..6b347a97757 100644
--- a/tao/Messaging/Asynch_Timeout_Handler.cpp
+++ b/tao/Messaging/Asynch_Timeout_Handler.cpp
@@ -7,10 +7,6 @@
#include "tao/Transport_Mux_Strategy.h"
#include "ace/Reactor.h"
-ACE_RCSID (Messaging,
- Asynch_Timeout_Handler,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_Asynch_Timeout_Handler::TAO_Asynch_Timeout_Handler (
diff --git a/tao/Messaging/Buffering_Constraint_Policy.cpp b/tao/Messaging/Buffering_Constraint_Policy.cpp
index e01d7c229c2..86438d796e9 100644
--- a/tao/Messaging/Buffering_Constraint_Policy.cpp
+++ b/tao/Messaging/Buffering_Constraint_Policy.cpp
@@ -8,10 +8,6 @@
#include "tao/SystemException.h"
#include "ace/CORBA_macros.h"
-ACE_RCSID (Messaging,
- Buffering_Constraint_Policy,
- "$Id$")
-
#if ! defined (__ACE_INLINE__)
#include "tao/Messaging/Buffering_Constraint_Policy.inl"
#endif /* __ACE_INLINE__ */
diff --git a/tao/Messaging/Connection_Timeout_Policy_i.cpp b/tao/Messaging/Connection_Timeout_Policy_i.cpp
index 29c67610c42..0b9bfe297f7 100644
--- a/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ b/tao/Messaging/Connection_Timeout_Policy_i.cpp
@@ -8,11 +8,6 @@
#include "tao/AnyTypeCode/Any.h"
#include "ace/Truncate.h"
-ACE_RCSID (Messaging,
- Connection_Timeout_Policy_i,
- "$Id$")
-
-
#if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Messaging/ExceptionHolder_i.cpp b/tao/Messaging/ExceptionHolder_i.cpp
index 725088e2b95..ab5c24f9206 100644
--- a/tao/Messaging/ExceptionHolder_i.cpp
+++ b/tao/Messaging/ExceptionHolder_i.cpp
@@ -3,10 +3,6 @@
#include "tao/Messaging/ExceptionHolder_i.h"
-ACE_RCSID (Messaging,
- ExceptionHolder_i,
- "$Id$")
-
#include "tao/Messaging/Messaging.h"
#include "tao/Exception_Data.h"
#include "tao/CDR.h"
diff --git a/tao/Messaging/Messaging.cpp b/tao/Messaging/Messaging.cpp
index a1c38d183a4..cf5ab688e61 100644
--- a/tao/Messaging/Messaging.cpp
+++ b/tao/Messaging/Messaging.cpp
@@ -6,10 +6,6 @@
#include "tao/debug.h"
-ACE_RCSID (Messaging,
- Messaging,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
int
diff --git a/tao/Messaging/Messaging_Loader.cpp b/tao/Messaging/Messaging_Loader.cpp
index a209e539fad..77a68ba9178 100644
--- a/tao/Messaging/Messaging_Loader.cpp
+++ b/tao/Messaging/Messaging_Loader.cpp
@@ -9,9 +9,6 @@
#include "tao/ORB_Core.h"
#include "tao/ORBInitializer_Registry.h"
-ACE_RCSID (Messaging, Messaging_Loader, "$Id$")
-
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_Messaging_Loader::TAO_Messaging_Loader (void)
diff --git a/tao/Messaging/Messaging_ORBInitializer.cpp b/tao/Messaging/Messaging_ORBInitializer.cpp
index 1924e7b1e97..147cb62fa82 100644
--- a/tao/Messaging/Messaging_ORBInitializer.cpp
+++ b/tao/Messaging/Messaging_ORBInitializer.cpp
@@ -12,10 +12,6 @@
#include "tao/PI/ORBInitInfo.h"
#include "tao/Valuetype/ValueFactory.h"
-ACE_RCSID (Messaging,
- Messaging_ORBInitializer,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
void
diff --git a/tao/Messaging/Messaging_PolicyFactory.cpp b/tao/Messaging/Messaging_PolicyFactory.cpp
index 5d1dad4b6ba..6a999b75866 100644
--- a/tao/Messaging/Messaging_PolicyFactory.cpp
+++ b/tao/Messaging/Messaging_PolicyFactory.cpp
@@ -1,9 +1,5 @@
#include "tao/Messaging/Messaging_PolicyFactory.h"
-ACE_RCSID (Messaging,
- Messaging_PolicyFactory,
- "$Id$")
-
#include "tao/Messaging/Messaging_Policy_i.h"
#include "tao/Messaging/Connection_Timeout_Policy_i.h"
#include "tao/Messaging/Buffering_Constraint_Policy.h"
diff --git a/tao/Messaging/Messaging_Policy_i.cpp b/tao/Messaging/Messaging_Policy_i.cpp
index 6a8ea3a75bb..ea3cb9c66c3 100644
--- a/tao/Messaging/Messaging_Policy_i.cpp
+++ b/tao/Messaging/Messaging_Policy_i.cpp
@@ -11,10 +11,6 @@
#include "tao/Messaging/Messaging_Policy_i.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Messaging,
- Messaging_Policy_i,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
diff --git a/tao/Messaging/Messaging_Queueing_Strategies.cpp b/tao/Messaging/Messaging_Queueing_Strategies.cpp
index daf835d2cf7..90c0e441f7d 100644
--- a/tao/Messaging/Messaging_Queueing_Strategies.cpp
+++ b/tao/Messaging/Messaging_Queueing_Strategies.cpp
@@ -8,11 +8,6 @@
#include "ace/Log_Msg.h"
#include "ace/OS_NS_sys_time.h"
-ACE_RCSID (Messaging,
- Messaging_Queueing_Strategies,
- "$Id$")
-
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/tao/PI/ClientRequestDetails.cpp b/tao/PI/ClientRequestDetails.cpp
index 0a58b63d43a..ce62da92000 100644
--- a/tao/PI/ClientRequestDetails.cpp
+++ b/tao/PI/ClientRequestDetails.cpp
@@ -7,10 +7,6 @@
#include "tao/PI/ClientRequestDetails.inl"
#endif /* defined INLINE */
-ACE_RCSID (PI,
- ClientRequestDetails,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/tao/PI/ClientRequestInfo.cpp b/tao/PI/ClientRequestInfo.cpp
index 09779bf3d40..92ce48e9617 100644
--- a/tao/PI/ClientRequestInfo.cpp
+++ b/tao/PI/ClientRequestInfo.cpp
@@ -4,10 +4,6 @@
#if TAO_HAS_INTERCEPTORS == 1
-ACE_RCSID (PI,
- ClientRequestInfo,
- "$Id$")
-
#include "tao/AnyTypeCode/Any.h"
#include "tao/AnyTypeCode/ExceptionA.h"
diff --git a/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index c1981b13f60..6d746b2ea5a 100644
--- a/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -13,10 +13,6 @@
#include "tao/ORB_Core_TSS_Resources.h"
#include "tao/PortableInterceptorC.h"
-ACE_RCSID (PI,
- ClientRequestInterceptorAdapter_Impl,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp b/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
index 6fe13dd9284..80f3fda2347 100644
--- a/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
+++ b/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
@@ -20,10 +20,6 @@
#include "tao/ORB.h"
#include "tao/debug.h"
-ACE_RCSID (PI,
- ClientRequestInterceptor_Factory_Impl,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO::ClientRequestInterceptor_Adapter*
diff --git a/tao/PI/DLL_Resident_ORB_Initializer.cpp b/tao/PI/DLL_Resident_ORB_Initializer.cpp
index c7ffe953cd5..e2d115b9b92 100644
--- a/tao/PI/DLL_Resident_ORB_Initializer.cpp
+++ b/tao/PI/DLL_Resident_ORB_Initializer.cpp
@@ -11,10 +11,6 @@
#include "tao/PI/DLL_Resident_ORB_Initializer.h"
-ACE_RCSID (TAO,
- DLL_Resident_ORBInitializer,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
PortableInterceptor::DLL_Resident_ORB_Initializer::DLL_Resident_ORB_Initializer (
diff --git a/tao/PI/ORBInitInfo.cpp b/tao/PI/ORBInitInfo.cpp
index f9a19537d97..5e051cd2101 100644
--- a/tao/PI/ORBInitInfo.cpp
+++ b/tao/PI/ORBInitInfo.cpp
@@ -14,10 +14,6 @@
#include "tao/PI/PICurrent.h"
#endif /* TAO_HAS_INTERCEPTORS == 1 */
-ACE_RCSID (PI,
- ORBInitInfo,
- "$Id$")
-
#if !defined (__ACE_INLINE__)
#include "tao/PI/ORBInitInfo.inl"
#endif /* defined INLINE */
diff --git a/tao/PI/ORBInitializer_Registry_Impl.cpp b/tao/PI/ORBInitializer_Registry_Impl.cpp
index c95b18f1bd0..5c0ad5ce42c 100644
--- a/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -14,11 +14,6 @@
#include "ace/Log_Msg.h"
#include "ace/CORBA_macros.h"
-ACE_RCSID (PI,
- ORBInitializer_Registry,
- "$Id$")
-
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO::ORBInitializer_Registry::ORBInitializer_Registry (void)
diff --git a/tao/PI/PI.cpp b/tao/PI/PI.cpp
index 54b9891e22d..4a8dde4d7a1 100644
--- a/tao/PI/PI.cpp
+++ b/tao/PI/PI.cpp
@@ -8,10 +8,6 @@
#include "tao/ORB_Constants.h"
#include "ace/CORBA_macros.h"
-ACE_RCSID (PI,
- PI,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/PI/PICurrent.cpp b/tao/PI/PICurrent.cpp
index 3d1793e9075..2a673e1eb3f 100644
--- a/tao/PI/PICurrent.cpp
+++ b/tao/PI/PICurrent.cpp
@@ -2,10 +2,6 @@
#if TAO_HAS_INTERCEPTORS == 1
-ACE_RCSID (tao,
- PICurrent,
- "$Id$")
-
#if !defined (__ACE_INLINE__)
# include "tao/PI/PICurrent.inl"
#endif /* __ACE_INLINE__ */
diff --git a/tao/PI/PICurrent_Impl.cpp b/tao/PI/PICurrent_Impl.cpp
index 7a78b7eeec6..5202a93ecec 100644
--- a/tao/PI/PICurrent_Impl.cpp
+++ b/tao/PI/PICurrent_Impl.cpp
@@ -2,10 +2,6 @@
#if TAO_HAS_INTERCEPTORS == 1
-ACE_RCSID (tao,
- PICurrent,
- "$Id$")
-
#include "tao/ORB_Core.h"
#if !defined (__ACE_INLINE__)
diff --git a/tao/PI/PICurrent_Loader.cpp b/tao/PI/PICurrent_Loader.cpp
index 804a577a4e3..4b1c949c3bf 100644
--- a/tao/PI/PICurrent_Loader.cpp
+++ b/tao/PI/PICurrent_Loader.cpp
@@ -21,10 +21,6 @@
#include "tao/ORB_Core.h"
#include "tao/debug.h"
-ACE_RCSID (PI,
- PICurrent_Loader,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
CORBA::Object_ptr
diff --git a/tao/PI/PI_ORBInitializer.cpp b/tao/PI/PI_ORBInitializer.cpp
index 9ba41f28778..bbdc82018f6 100644
--- a/tao/PI/PI_ORBInitializer.cpp
+++ b/tao/PI/PI_ORBInitializer.cpp
@@ -12,10 +12,6 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-ACE_RCSID (tao,
- PI_ORBInitializer,
- "$Id$")
-
void
TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
{
diff --git a/tao/PI/PI_PolicyFactory.cpp b/tao/PI/PI_PolicyFactory.cpp
index ccb5a6a50da..a8f5ad4b9c6 100644
--- a/tao/PI/PI_PolicyFactory.cpp
+++ b/tao/PI/PI_PolicyFactory.cpp
@@ -9,10 +9,6 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-ACE_RCSID (tao,
- PI_PolicyFactory,
- "$Id$")
-
CORBA::Policy_ptr
TAO_PI_PolicyFactory::create_policy (
CORBA::PolicyType type,
diff --git a/tao/PI/PolicyFactory_Loader.cpp b/tao/PI/PolicyFactory_Loader.cpp
index bacc2ea9889..34bfff09e1b 100644
--- a/tao/PI/PolicyFactory_Loader.cpp
+++ b/tao/PI/PolicyFactory_Loader.cpp
@@ -17,10 +17,6 @@
#include "tao/ORB.h"
#include "tao/debug.h"
-ACE_RCSID (PI,
- PolicyFactory_Loader,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO::PolicyFactory_Registry_Adapter*
diff --git a/tao/PI/PolicyFactory_Registry.cpp b/tao/PI/PolicyFactory_Registry.cpp
index 00fc855faec..e1658135d03 100644
--- a/tao/PI/PolicyFactory_Registry.cpp
+++ b/tao/PI/PolicyFactory_Registry.cpp
@@ -4,11 +4,6 @@
#include "tao/PolicyC.h"
#include "tao/SystemException.h"
-ACE_RCSID (PI,
- PolicyFactory_Registry,
- "$Id$")
-
-
// ****************************************************************
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/PI/ProcessingModePolicy.cpp b/tao/PI/ProcessingModePolicy.cpp
index 0a5627af836..26e2a60a021 100644
--- a/tao/PI/ProcessingModePolicy.cpp
+++ b/tao/PI/ProcessingModePolicy.cpp
@@ -10,10 +10,6 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-ACE_RCSID (tao,
- ProcessingModePolicy,
- "$Id$")
-
// Should this all be wrapped in #if (TAO_HAS_MINIMUM_POA == 0)?
TAO_ProcessingModePolicy::TAO_ProcessingModePolicy
diff --git a/tao/PI/RequestInfo_Util.cpp b/tao/PI/RequestInfo_Util.cpp
index 05253829f24..f9483503443 100644
--- a/tao/PI/RequestInfo_Util.cpp
+++ b/tao/PI/RequestInfo_Util.cpp
@@ -13,10 +13,6 @@
#include "tao/SystemException.h"
#include "ace/CORBA_macros.h"
-ACE_RCSID (tao,
- RequestInfo_Util,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
Dynamic::ParameterList
diff --git a/tao/PI/RequestInterceptor_Adapter_Impl.cpp b/tao/PI/RequestInterceptor_Adapter_Impl.cpp
index 7e5df08de77..625924a6506 100644
--- a/tao/PI/RequestInterceptor_Adapter_Impl.cpp
+++ b/tao/PI/RequestInterceptor_Adapter_Impl.cpp
@@ -20,10 +20,6 @@
#include "tao/PI/PICurrent.h"
#include "tao/PI/PICurrent_Impl.h"
-ACE_RCSID (tao,
- TAO_RequestInterceptorAdapter_Impl,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_RequestInterceptor_Adapter_Impl::~TAO_RequestInterceptor_Adapter_Impl (void)
diff --git a/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp b/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
index a0212ddde94..545f4c813d7 100644
--- a/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
+++ b/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
@@ -2,10 +2,6 @@
#include "tao/Valuetype/AbstractBase_Invocation_Adapter.h"
#include "tao/Valuetype/AbstractBase.h"
-ACE_RCSID (Valuetype,
- AbstractBase_Invocation_Adapter,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/tao/Valuetype/ValueBase.cpp b/tao/Valuetype/ValueBase.cpp
index aa52b46600f..edb794c76c1 100644
--- a/tao/Valuetype/ValueBase.cpp
+++ b/tao/Valuetype/ValueBase.cpp
@@ -20,10 +20,6 @@
# include "tao/Valuetype/ValueBase.inl"
#endif /* ! __ACE_INLINE__ */
-ACE_RCSID (Valuetype,
- ValueBase,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
#define DEFAULT_INDIRECTION_MAP_SIZE 10
diff --git a/tao/Valuetype/ValueFactory.cpp b/tao/Valuetype/ValueFactory.cpp
index a03b7be5bc7..03d27870ebf 100644
--- a/tao/Valuetype/ValueFactory.cpp
+++ b/tao/Valuetype/ValueFactory.cpp
@@ -1,10 +1,6 @@
#include "tao/Valuetype/ValueFactory.h"
#include "ace/Guard_T.h"
-ACE_RCSID (Valuetype,
- ValueFactory,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Static operations in namespace CORBA.
diff --git a/tao/Valuetype/ValueFactory_Map.cpp b/tao/Valuetype/ValueFactory_Map.cpp
index 42269201b10..782b2ce8d0c 100644
--- a/tao/Valuetype/ValueFactory_Map.cpp
+++ b/tao/Valuetype/ValueFactory_Map.cpp
@@ -2,10 +2,6 @@
#include "tao/Valuetype/ValueFactory.h"
#include "tao/CORBA_String.h"
-ACE_RCSID (Valuetype,
- ValueFactory_Map,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_ValueFactory_Map::TAO_ValueFactory_Map (void)
diff --git a/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp b/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
index 185d5544fb2..9b9be8cc550 100644
--- a/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
+++ b/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
@@ -6,10 +6,6 @@
#include "tao/ORB_Core.h"
#include "tao/SystemException.h"
-ACE_RCSID (ValueType,
- Valuetype_Adapter_Factory_Impl,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_Valuetype_Adapter_Factory_Impl::~TAO_Valuetype_Adapter_Factory_Impl (void)
diff --git a/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/tao/Valuetype/Valuetype_Adapter_Impl.cpp
index 2237df9da76..dbc75a06b9d 100644
--- a/tao/Valuetype/Valuetype_Adapter_Impl.cpp
+++ b/tao/Valuetype/Valuetype_Adapter_Impl.cpp
@@ -8,11 +8,6 @@
#include "tao/ORB_Core.h"
-
-ACE_RCSID (Valuetype,
- Valuetype_Adapter_Impl,
- "$Id$")
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_Valuetype_Adapter_Impl::~TAO_Valuetype_Adapter_Impl (void)