From 45eefc686b90b6fd44a9505510de3329f122a1f2 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 9 Sep 2010 07:20:23 +0000 Subject: Zapped ACE_RCSID --- .../FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp | 7 +------ TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp | 4 ---- TAO/orbsvcs/examples/CosEC/Simple/Service.cpp | 4 ---- TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp | 4 ---- TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp | 4 ---- TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp | 8 ++------ TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp | 7 ++----- .../LoadBalancing/ServerRequestInterceptor.cpp | 7 ++----- TAO/orbsvcs/examples/LoadBalancing/client.cpp | 8 ++------ TAO/orbsvcs/examples/LoadBalancing/server.cpp | 6 ++---- TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp | 6 ++---- TAO/orbsvcs/examples/Log/Basic/main.cpp | 7 ++----- TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp | 4 ---- TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp | 6 ++---- TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp | 6 ++---- TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp | 7 ++----- TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp | 6 ++---- TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp | 6 ++---- TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp | 5 ----- TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp | 4 ---- TAO/orbsvcs/examples/ORT/Gateway_i.cpp | 4 ---- .../ORT/Server_IORInterceptor_ORBInitializer.cpp | 4 ---- TAO/orbsvcs/examples/ORT/client.cpp | 5 +---- TAO/orbsvcs/examples/ORT/sum_server_i.cpp | 4 ---- TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp | 4 ---- TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp | 4 ---- TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp | 4 ---- TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp | 4 ---- TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp | 4 ---- TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp | 5 ----- TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp | 4 ---- TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp | 4 ---- TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp | 4 ---- TAO/orbsvcs/examples/RtEC/Simple/Service.cpp | 4 ---- TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp | 4 ---- .../Security/SecurityLevel1/SLevel1_Test_i.cpp | 4 ---- .../examples/Security/SecurityLevel1/server.cpp | 4 ---- TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp | 4 ---- TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp | 4 ---- TAO/orbsvcs/orbsvcs/AV/UDP.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp | 5 ----- TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp | 4 ---- TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp | 4 ---- TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp | 5 ----- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp | 5 ----- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp | 10 +++------- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp | 4 ---- .../orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp | 4 ---- .../orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp | 4 ---- .../orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp | 4 ---- .../orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp | 4 ---- .../orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp | 4 ---- .../orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp | 4 ---- TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp | 5 ----- TAO/orbsvcs/orbsvcs/Daemon_Utilities.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp | 4 ---- .../orbsvcs/Event/ECG_CDR_Message_Receiver.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp | 7 ------- TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp | 6 ------ TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp | 4 ---- .../orbsvcs/Event/EC_Default_ProxySupplier.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp | 5 ----- TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp | 4 ---- .../orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp | 4 ---- .../FaultTolerance/FT_ClientORBInitializer.cpp | 4 ---- .../orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp | 4 ---- .../FaultTolerance/FT_ClientRequest_Interceptor.cpp | 5 ----- .../FaultTolerance/FT_Endpoint_Selector_Factory.cpp | 5 ----- .../orbsvcs/FaultTolerance/FT_IOGR_Property.cpp | 5 ----- .../FT_Invocation_Endpoint_Selectors.cpp | 5 +---- .../orbsvcs/FaultTolerance/FT_ORBInitializer.cpp | 6 ------ .../FaultTolerance/FT_ServerORBInitializer.cpp | 5 ----- .../orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp | 6 ------ .../FaultTolerance/FT_ServerRequest_Interceptor.cpp | 6 ++---- .../orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp | 5 ----- .../ClientORB/FTRT_ClientORB_Initializer.cpp | 4 ---- .../ClientORB/FTRT_ClientORB_Interceptor.cpp | 4 ---- .../FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp | 5 ----- .../FtRtEvent/EventChannel/FTEC_Event_Channel.cpp | 4 ---- .../EventChannel/FTEC_Event_Channel_Impl.cpp | 5 ----- .../orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp | 5 +---- .../FtRtEvent/EventChannel/FTEC_Group_Manager.cpp | 4 ---- .../FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp | 5 ----- .../FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp | 4 ---- .../FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp | 4 ---- .../EventChannel/FtEventServiceInterceptor.cpp | 4 ---- .../FtRtEvent/EventChannel/GroupInfoPublisher.cpp | 7 ------- .../orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp | 4 ---- .../FtRtEvent/EventChannel/Identification_Service.cpp | 5 ----- .../EventChannel/ProxyConsumerStateWorker.cpp | 4 ---- .../EventChannel/ProxySupplierStateWorker.cpp | 4 ---- .../FtRtEvent/EventChannel/Replication_Service.cpp | 5 ----- .../FtRtEvent/EventChannel/Replication_Strategy.cpp | 5 ----- .../EventChannel/Request_Context_Repository.cpp | 4 ---- .../FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp | 4 ---- .../FtRtEvent/EventChannel/Set_Update_Interceptor.cpp | 4 ---- .../orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp | 4 ---- .../FtRtEvent/EventChannel/UpdateableHandler.cpp | 5 ----- .../orbsvcs/FtRtEvent/EventChannel/replace_key.cpp | 7 ++----- TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp | 4 ---- TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp | 4 +--- TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp | 4 ---- .../orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp | 5 ----- .../orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp | 5 ----- TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp | 5 ----- TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp | 5 ----- TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp | 4 ---- TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp | 4 ---- TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp | 4 ---- .../orbsvcs/IFRService/AbstractInterfaceDef_i.cpp | 8 +------- TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp | 9 +-------- .../orbsvcs/IFRService/ComponentContainer_i.cpp | 4 ---- TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp | 11 +++-------- .../orbsvcs/IFRService/ComponentModuleDef_i.cpp | 5 ----- .../orbsvcs/IFRService/ComponentRepository_i.cpp | 8 +------- TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp | 10 +--------- TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp | 6 ------ TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp | 9 +-------- TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp | 8 +------- .../orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp | 7 +------ TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp | 6 ------ TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp | 9 +-------- .../orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp | 8 +------- TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp | 13 ++++--------- TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp | 8 +------- TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp | 4 ---- TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp | 6 ------ TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp | 4 ---- TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp | 14 +++++--------- TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp | 6 ------ .../orbsvcs/IFRService/InterfaceAttrExtension_i.cpp | 8 +------- TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp | 9 +-------- .../orbsvcs/IFRService/LocalInterfaceDef_i.cpp | 8 +------- TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp | 6 ------ TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp | 6 ------ TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp | 8 +------- TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp | 10 +--------- TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp | 8 +------- TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp | 9 +-------- TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp | 9 +-------- TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp | 5 ----- TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp | 19 +++++++------------ TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp | 9 +-------- TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp | 9 +-------- TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp | 4 ---- .../LoadBalancing/LB_CPU_Load_Average_Monitor.cpp | 6 ++---- .../LoadBalancing/LB_CPU_Utilization_Monitor.cpp | 6 ++---- .../orbsvcs/LoadBalancing/LB_ClientComponent.cpp | 6 ++---- .../orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp | 7 ++----- .../LoadBalancing/LB_ClientRequestInterceptor.cpp | 8 ++------ TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp | 6 ++---- .../orbsvcs/LoadBalancing/LB_IORInterceptor.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp | 8 ++------ TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp | 7 ++----- .../orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp | 6 ++---- .../orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp | 8 ++------ TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp | 8 ++------ TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp | 7 ++----- TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp | 8 ++------ .../orbsvcs/LoadBalancing/LB_MemberLocator.cpp | 7 ++----- .../orbsvcs/LoadBalancing/LB_ORBInitializer.cpp | 7 ++----- .../LoadBalancing/LB_ObjectReferenceFactory.cpp | 8 ++------ TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp | 8 ++------ TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp | 5 +---- TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp | 17 +++++++---------- .../LoadBalancing/LB_ServerRequestInterceptor.cpp | 9 ++------- TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp | 7 ++----- TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp | 7 ++----- TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp | 7 ++----- TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp | 7 ++----- .../orbsvcs/Log/Log_Constraint_Interpreter.cpp | 7 ++----- TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp | 16 +++++++--------- TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/Log_i.cpp | 7 ++----- TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp | 7 ++----- TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp | 7 ++----- TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp | 9 --------- TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp | 4 ---- .../orbsvcs/Naming/Persistent_Naming_Context.cpp | 9 +++------ .../orbsvcs/Naming/Storable_Naming_Context.cpp | 15 --------------- TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp | 7 ------- .../orbsvcs/Security/SL2_EstablishTrustPolicy.cpp | 8 +------- TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp | 8 +------- TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp | 5 ----- .../Security/SL3_ContextEstablishmentPolicy.cpp | 5 ----- .../Security/SL3_CredentialsAcquirerFactory.cpp | 7 ++----- .../orbsvcs/Security/SL3_CredentialsCurator.cpp | 5 ----- .../orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp | 6 ------ TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp | 6 ------ TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp | 6 ------ .../orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp | 6 +----- TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp | 6 ------ TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp | 5 +---- .../orbsvcs/Security/Security_Current_Impl.cpp | 5 +---- .../orbsvcs/Security/Security_ORBInitializer.cpp | 8 +------- .../orbsvcs/Security/Security_PolicyFactory.cpp | 6 +----- TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp | 4 ---- TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp | 6 ------ TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp | 7 ++----- TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp | 6 ------ 255 files changed, 200 insertions(+), 1281 deletions(-) (limited to 'TAO/orbsvcs') diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp index 770d8ef9870..03de6907c61 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp @@ -20,11 +20,6 @@ #include "tao/debug.h" #include "ace/OS_NS_string.h" -ACE_RCSID (FT_DefaultFaultAnalyzer, - FT_DefaultFaultAnalyzer, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Default constructor. @@ -88,7 +83,7 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type ( // // The filterable_data part of the event body contains the // identity of the crashed object as four name-value pairs: the - // fault tolerance domain identifier, the member’s location + // fault tolerance domain identifier, the member�s location // identifier, the repository identifier and the object group // identifier. The Fault Notifier filters events based on the // domain_name, the type_name, and the four identifiers. All diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index 215f8f99441..a622faa18d7 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -4,10 +4,6 @@ #include "orbsvcs/CosEventChannelAdminS.h" #include "ace/Get_Opt.h" -ACE_RCSID (CosEC_Examples, - Consumer, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://ec.ior"); int diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp index 1c3682594ec..d04f4b50abc 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp @@ -5,10 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (CosEC_Simple, - Service, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("ec.ior"); int diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp index f3251b8e281..49d8c91f572 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp @@ -5,10 +5,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/Get_Opt.h" -ACE_RCSID (CosEC_Examples, - Supplier, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://ec.ior"); int diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp index 6477e58705e..e1817ebd6e2 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp @@ -34,10 +34,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) return 0; } -ACE_RCSID (CosEC_Examples, - Consumer, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp index 1641db55b1e..ce75f2fc99d 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "ORBInitializer.h" #include "ServerRequestInterceptor.h" @@ -6,12 +8,6 @@ #include "orbsvcs/CosLoadBalancingC.h" #include "tao/ORB_Constants.h" - -ACE_RCSID (LoadBalancing, - ORBInitializer, - "$Id$") - - ORBInitializer::ORBInitializer (void) : load_alert_ (), interceptor_ (0) diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp index fef78a9b20a..546ec30fd68 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp @@ -1,14 +1,11 @@ +// $Id$ + #include "RPS_Monitor.h" #include "ServerRequestInterceptor.h" #include "ace/UUID.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_sys_time.h" -ACE_RCSID (LoadBalancing, - RPS_Monitor, - "$Id$") - - RPS_Monitor::RPS_Monitor (ServerRequestInterceptor * interceptor) : location_ (1), interceptor_ (interceptor), diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp index 5e200084da9..9acee119ccd 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp @@ -1,9 +1,6 @@ -#include "ServerRequestInterceptor.h" - -ACE_RCSID (LoadBalancing, - ServerRequestInterceptor, - "$Id$") +// $Id$ +#include "ServerRequestInterceptor.h" ServerRequestInterceptor::ServerRequestInterceptor (void) : request_count_ (0) diff --git a/TAO/orbsvcs/examples/LoadBalancing/client.cpp b/TAO/orbsvcs/examples/LoadBalancing/client.cpp index d3c1dc441a7..0fffb5dfc17 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/client.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/client.cpp @@ -1,13 +1,9 @@ +// $Id$ + #include "TestC.h" #include "ace/Get_Opt.h" #include "ace/streams.h" - -ACE_RCSID (LoadBalancing, - client, - "$Id$") - - const ACE_TCHAR *ior = ACE_TEXT("file://obj.ior"); int niterations = 100; diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp index 877811db90e..8a0a89b782b 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "tao/ORBInitializer_Registry.h" #include "StockFactory.h" #include "ORBInitializer.h" @@ -7,10 +9,6 @@ #include "ace/Get_Opt.h" -ACE_RCSID (LoadBalancing, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("obj.ior"); CORBA::Float reject_threshold = 0; diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp index c2c926fc03a..b5fac6be20a 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp @@ -1,10 +1,8 @@ +// $Id$ + #include "TLS_Client.h" #include "ace/Log_Msg.h" -ACE_RCSID (Basic, - TLS_Client, - "$Id$") - #define NAMING_SERVICE_NAME "NameService" #define BASIC_TLS_LOG_FACTORY_NAME "BasicLogFactory" #define LOG_EVENT_COUNT 9 diff --git a/TAO/orbsvcs/examples/Log/Basic/main.cpp b/TAO/orbsvcs/examples/Log/Basic/main.cpp index e3fb93ff58c..fa9b4071031 100644 --- a/TAO/orbsvcs/examples/Log/Basic/main.cpp +++ b/TAO/orbsvcs/examples/Log/Basic/main.cpp @@ -1,11 +1,8 @@ +// $Id$ + #include "TLS_Client.h" #include "ace/OS_main.h" -ACE_RCSID (Basic, - main, - "$Id$") - - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index 336f21db41b..13b7f0b318e 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -2,10 +2,6 @@ #include "orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_main.h" -ACE_RCSID (Event, - Event_Consumer, - "$Id$") - #define NAMING_SERVICE_NAME "NameService" #define EVENT_TLS_LOG_FACTORY_NAME "EventLogFactory" diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp index 32dcb270078..c6663a74cb2 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp @@ -1,11 +1,9 @@ +// $Id$ + #include "Event_Supplier.h" #include "orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_main.h" -ACE_RCSID (Event, - Event_Supplier, - "$Id$") - #define NAMING_SERVICE_NAME "NameService" #define EVENT_TLS_LOG_FACTORY_NAME "EventLogFactory" #define LOG_EVENT_COUNT 9 diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp index 16872092e01..7eb34e19523 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp @@ -1,12 +1,10 @@ +// $Id$ + #include "Notify_Consumer.h" #include "orbsvcs/CosEventChannelAdminS.h" #include "orbsvcs/CosNotifyChannelAdminS.h" #include "ace/OS_main.h" -ACE_RCSID (Notify, - Notify_Consumer, - "$Id$") - #define NAMING_SERVICE_NAME "NameService" #define NOTIFY_TLS_LOG_FACTORY_NAME "NotifyLogFactory" #define LOG_EVENT_COUNT 29 diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index 28061b61d0b..60f2323abe7 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp @@ -1,12 +1,9 @@ +// $Id$ + #include "Notify_Supplier.h" #include "orbsvcs/CosNotifyChannelAdminS.h" #include "ace/OS_main.h" -ACE_RCSID (Notify, - Notify_Supplier, - "$Id$") - - #define NAMING_SERVICE_NAME "NameService" #define NOTIFY_TLS_LOG_FACTORY_NAME "NotifyLogFactory" #define LOG_EVENT_COUNT 10 diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp index b17859f534c..dbb42d94488 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp @@ -1,12 +1,10 @@ +// $Id$ + #include "RTEvent_Consumer.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/Event_Service_Constants.h" #include "ace/OS_main.h" -ACE_RCSID (RTEvent, - RTEvent_Consumer, - "$Id$") - #define NAMING_SERVICE_NAME "NameService" #define EVENT_TLS_LOG_FACTORY_NAME "RTEventLogFactory" diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index f15eb352a41..191092bb109 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -1,13 +1,11 @@ +// $Id$ + #include "RTEvent_Supplier.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/Event_Service_Constants.h" #include "ace/OS_main.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (RTEvent, - RTEvent_Supplier, - "$Id$") - #define NAMING_SERVICE_NAME "NameService" #define EVENT_TLS_LOG_FACTORY_NAME "RTEventLogFactory" #define LOG_EVENT_COUNT 29 diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp index 02e5c007748..37aea1702ba 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp @@ -2,11 +2,6 @@ #include "Consumer.h" -ACE_RCSID (Notify, - TAO_Notify_Lanes_Consumer, - "$Id$") - - TAO_Notify_Lanes_Consumer::TAO_Notify_Lanes_Consumer (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) { diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp index 9e06af2c97a..767c4c94bb9 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp @@ -2,10 +2,6 @@ #include "Consumer.h" -ACE_RCSID (Notify, - TAO_Notify_ThreadPool_Consumer, - "$Id$") - #include "tao/debug.h" #include "ace/High_Res_Timer.h" diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp index 1b2b044effd..2f1c2b82780 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp +++ b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp @@ -15,10 +15,6 @@ #include "tao/ORB.h" #include "tao/LocalObject.h" -ACE_RCSID (ORT, - Gateway_i, - "$Id$") - Gateway_i:: Gateway_i (CORBA::ORB_ptr orb, PortableServer::Current_ptr poa_current) diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp index 42306c63e67..005396f8a49 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp @@ -6,10 +6,6 @@ #include "GatewayC.h" -ACE_RCSID (ORT, - Server_IORInterceptor_ORBInitializer, - "$Id: ") - void Server_IORInterceptor_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ diff --git a/TAO/orbsvcs/examples/ORT/client.cpp b/TAO/orbsvcs/examples/ORT/client.cpp index 7966bac268b..679a8918339 100644 --- a/TAO/orbsvcs/examples/ORT/client.cpp +++ b/TAO/orbsvcs/examples/ORT/client.cpp @@ -1,12 +1,9 @@ // -*- C++ -*- +// $Id$ #include "sum_serverC.h" #include "ace/Get_Opt.h" -ACE_RCSID (ORT, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp index fe8a7a38833..25d3ee8dfd1 100644 --- a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp +++ b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp @@ -2,10 +2,6 @@ #include "sum_server_i.h" -ACE_RCSID (ORT, - sum_server_i, - "$Id$") - sum_server_i::sum_server_i () { } diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp index 280290a51db..107e6a454ae 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp @@ -8,10 +8,6 @@ #include "ace/Arg_Shifter.h" #include "ace/OS_NS_string.h" -ACE_RCSID (EC_Examples, - Consumer, - "$Id$") - const RtecEventComm::EventSourceID MY_SOURCE_ID = ACE_ES_EVENT_SOURCE_ANY + 1; const RtecEventComm::EventType MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1; diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp index cd9a0a226ef..bdcc1fb61d6 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp @@ -9,10 +9,6 @@ #include "orbsvcs/Event/EC_Gateway.h" #include "ace/Arg_Shifter.h" -ACE_RCSID (EC_Examples, - Supplier, - "$Id$") - static const ACE_TCHAR *ecname = 0; int diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp index 960c99a112c..d763170382f 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp @@ -9,10 +9,6 @@ #include "ace/Arg_Shifter.h" #include "ace/Dynamic_Service.h" -ACE_RCSID (EC_Examples, - Supplier, - "$Id$") - static const ACE_TCHAR *supplierec = 0; static const ACE_TCHAR *consumerec = 0; diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp index 3954787c61a..935e2a66008 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp @@ -9,10 +9,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Examples, - Supplier, - "$Id$") - const RtecEventComm::EventSourceID MY_SOURCE_ID = ACE_ES_EVENT_SOURCE_ANY + 1; const RtecEventComm::EventType MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1; diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp index 125c8b7775d..69b98c3b552 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp @@ -4,10 +4,6 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" -ACE_RCSID (EC_Examples, - Consumer, - "$Id$") - Consumer::Consumer (void) : event_count_ (0) { diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp index 9589df228da..5fbf3912983 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp @@ -1,6 +1,5 @@ // $Id$ - #include "Consumer.h" #include "Supplier.h" #include "AddrServer.h" @@ -15,10 +14,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Examples, - MCast, - "$Id$") - const ACE_TCHAR *udp_mcast_address = ACE_TEXT (ACE_DEFAULT_MULTICAST_ADDR) ACE_TEXT(":10001"); diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp index 5ad924f7209..5ec77c0b47f 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp @@ -4,10 +4,6 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" -ACE_RCSID (EC_Examples, - Supplier, - "$Id$") - Supplier::Supplier (void) { } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp index f1714bf8773..ae4549a37b8 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp @@ -2,10 +2,6 @@ #include "Supplier.h" -ACE_RCSID (EC_Examples, - Supplier, - "$Id$") - Supplier::Supplier (void) { } diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp index c38b2f7a2bf..1edc1f633e3 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp @@ -5,10 +5,6 @@ #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/CosNamingC.h" -ACE_RCSID (EC_Examples, - Consumer, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp index 3d40a284ca5..808711f6afb 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp @@ -6,10 +6,6 @@ #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (EC_Examples, - Service, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("ec.ior"); int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp index a15f5690fe3..589dfbbcd90 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp @@ -6,10 +6,6 @@ #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Examples, - Supplier, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp index 6a3e81510bb..759335e549f 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp @@ -6,10 +6,6 @@ #include "test_i.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (SecurityLevel1, - SLevel1_Test_i, - "$Id$") - static int authorize_1 = 1; static int authorize_2 = 1; diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp index 5a0225c4cd7..d40c741f314 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp @@ -2,10 +2,6 @@ #include "SLevel1_Test_i.h" -ACE_RCSID (SecurityLevel1, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = 0; int diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index c6c39506b9e..3d8e7d7b357 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -23,10 +23,6 @@ #include "orbsvcs/AV/AVStreams_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (AV, - AVStreams_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL //------------------------------------------------------------ diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp index 2bd859ea78f..df916055a26 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp @@ -10,10 +10,6 @@ #include "ace/Arg_Shifter.h" #include "ace/os_include/os_netdb.h" -ACE_RCSID (AV, - SCTP_SEQ, - "SCTP_SEQ.cpp,v 1.3 2003/11/05 21:06:53 yamuna Exp") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL //------------------------------------------------------------ diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index 712232f0556..4950e268695 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -11,10 +11,6 @@ #include "orbsvcs/AV/UDP.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (AV, - UDP, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL //------------------------------------------------------------ diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp index c826c2bbebe..3d34f1fd4fb 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp @@ -20,10 +20,6 @@ #include "orbsvcs/Concurrency/CC_Lock.h" #include "ace/Log_Msg.h" -ACE_RCSID (Concurrency, - CC_Lock, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CC_Lock::CC_Lock (void) diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index b49c3bf386e..b04be1282ca 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -12,11 +12,6 @@ #include "orbsvcs/Concurrency/CC_LockSet.h" -ACE_RCSID (Concurrency, - CC_LockSet, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Default constructor. diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp index df98c3160d2..94fc4610043 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -14,10 +14,6 @@ #include "tao/debug.h" #include "orbsvcs/Concurrency/Concurrency_Utils.h" -ACE_RCSID (Concurrency, - Concurrency_Utils, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Default constructor diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index 887b373af45..0ad34e15760 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -12,10 +12,6 @@ #include "orbsvcs/CosEvent/CEC_ConsumerAdmin.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (CosEvent, - CEC_ConsumerAdmin, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp index 570fe05a684..6740acf67da 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp @@ -2,11 +2,6 @@ #include "orbsvcs/CosEvent/CEC_ConsumerControl.h" -ACE_RCSID (CosEvent, - CEC_ConsumerControl, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl (void) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index b6666ea3207..f4bd0609486 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -40,11 +40,6 @@ #include "orbsvcs/CosEvent/CEC_Default_Factory.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (CosEvent, - CEC_Default_Factory, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory (void) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index 7bf3b4547e4..819d431dd1b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -12,23 +12,19 @@ #include "ace/OS_NS_errno.h" -ACE_RCSID (CosEvent, - CEC_Dispatching, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int TAO_CEC_Dispatching_Task::svc (void) { bool done = false; - + while (!done) { try { ACE_Message_Block *mb = 0; - + if (this->getq (mb) == -1) { if (ACE_OS::last_error () == ESHUTDOWN) @@ -65,7 +61,7 @@ TAO_CEC_Dispatching_Task::svc (void) ex._tao_print_exception ("EC (%P|%t) exception in dispatching queue"); } } - + return 0; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index 42a2f6a53f1..f53f3cea315 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -28,10 +28,6 @@ #include "ace/OS_NS_unistd.h" #include "tao/debug.h" -ACE_RCSID (CosEvent, - CEC_Event_Loader, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) : diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index c8400b43e42..68565691851 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -12,10 +12,6 @@ #include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (CosEvent, - CEC_ProxyPullConsumer, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Reverse_Lock TAO_CEC_Unlock; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index 5863632eeab..9ded55dc62e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -10,10 +10,6 @@ #include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (CosEvent, - CEC_ProxyPullSupplier, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Reverse_Lock TAO_CEC_Unlock; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index 4b59157f480..cb8caddc6ad 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -11,10 +11,6 @@ #include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (CosEvent, - CEC_ProxyPushConsumer, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Reverse_Lock TAO_CEC_Unlock; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index 4e964d3c8e7..99a601ceddf 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -26,10 +26,6 @@ #include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (CosEvent, - CEC_ProxyPushSupplier, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Reverse_Lock TAO_CEC_Unlock; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index edefe1fccab..e8be4970426 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -30,10 +30,6 @@ #include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (CosEvent, - CEC_Reactive_ConsumerControl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_CEC_Reactive_ConsumerControl constructor for the Un-typed EC diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index e819882e7ce..6d02ae32db2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -31,10 +31,6 @@ #include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (CosEvent, - CEC_Reactive_SupplierControl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_CEC_Reactive_SupplierControl constructor for the Un-typed EC diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index 1f77e5ecdba..6a5bba0262c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -10,11 +10,6 @@ #include "orbsvcs/CosEvent/CEC_SupplierAdmin.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (CosEvent, - CEC_SupplierAdmin, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec) diff --git a/TAO/orbsvcs/orbsvcs/Daemon_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Daemon_Utilities.cpp index 79531a513bc..0c634b97244 100644 --- a/TAO/orbsvcs/orbsvcs/Daemon_Utilities.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp index 8813fee591c..50df688ca02 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp index 8f26a1bc535..6a6c0d61941 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index b076949f084..ef969994abd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -8,13 +8,6 @@ #include "orbsvcs/Event/ECG_UDP_Receiver.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Event, - ECG_UDP_Receiver, - "$Id$") - - -// **************************************************************** - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_UDP_Receiver::~TAO_ECG_UDP_Receiver (void) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index 2f0ae9dac8a..30078b9b547 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -17,12 +17,6 @@ #include "orbsvcs/Event/ECG_UDP_Sender.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Event, - ECG_UDP_Sender, - "$Id$") - -// **************************************************************** - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_UDP_Sender::~TAO_ECG_UDP_Sender (void) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index 9ca34c2bc9e..9dce3bc79f0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index 8c7026d2c59..a6f15eac907 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp index 6b97a3226de..e408364f8b5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp +++ b/TAO/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 TAO_EC_Unlock; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index dceb0b1c894..18d5024f68c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp index ef641d07bbf..94628a5ff5a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp index 8addbb46165..01c0f5c1e8c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index ee1aec04bd5..7c645873577 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index 89f3e1da43e..b1711600126 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp index 319d1167fad..9cc898d7698 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index 7271282ef5a..205f4429e00 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -18,10 +18,6 @@ #include "orbsvcs/Event/EC_Kokyu_Dispatching.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Event, - EC_Kokyu_Dispatching, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *ec, int sched_policy, int sched_scope) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp index 969aeeafd09..35d28320b76 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -15,10 +15,6 @@ #include "orbsvcs/Event/EC_Kokyu_Factory.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Event, - EC_Kokyu_Factory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory (void) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp index 62e4a446f95..4da636491ea 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp @@ -14,10 +14,6 @@ #include "orbsvcs/Event/EC_Kokyu_Filter_Builder.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Event, - EC_Kokyu_Filter_Builder, - "$Id$") - const char* designator (long dsgn) { switch(dsgn) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp index c0c4d79e1ee..4c7d333e330 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/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 TAO_EC_Unlock; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index 6243bc26558..feaa1099b1b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/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 TAO_EC_Unlock; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp index fbdfb022768..9df36523c84 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index 8191211f5bc..9af62d1d36a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index 453af4eeaf2..19724045232 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index 51438a687d2..2700fcc4d22 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp index 940a7596935..d3b138a0eac 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp @@ -12,10 +12,6 @@ #include "tao/ORB_Core.h" #include "tao/PI/ORBInitInfo.h" -ACE_RCSID (FaultTolerance, - FT_ClientORBInitializer, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp index ef3795e1fc2..3fd4f289aaf 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp @@ -5,10 +5,6 @@ #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" -ACE_RCSID (FaultTolerance, - FT_ClientPolicyFactory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Policy_ptr diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index 7512098d5fe..4c936a7a8fd 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -15,11 +15,6 @@ #include "ace/Lock.h" #include "ace/Synch_Traits.h" -ACE_RCSID (FaultTolerance, - FT_ORBInitializer, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp index 199956473af..d3ab4c835d7 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp @@ -4,11 +4,6 @@ #include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h" #include "tao/SystemException.h" - -ACE_RCSID (FaultTolerance, - FT_Endpoint_Selector_Factory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_FT_Endpoint_Selector_Factory::TAO_FT_Endpoint_Selector_Factory (void) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index dc009be5324..9319bb83665 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -10,11 +10,6 @@ #include "ace/Auto_Ptr.h" #include "tao/debug.h" - -ACE_RCSID (FaultTolerance, - TAO_FT_IOGR_Property, - "$Id$") - #if !defined (__ACE_INLINE__) # include "orbsvcs/FaultTolerance/FT_IOGR_Property.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp index 142cc8f5a08..4add9825a22 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h" @@ -11,10 +12,6 @@ #include "tao/debug.h" #include "ace/Log_Msg.h" -ACE_RCSID (FaultTolerance, - FT_Invocation_Endpoint_Selectors, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_FT_Invocation_Endpoint_Selector::TAO_FT_Invocation_Endpoint_Selector (void) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp index 4d99eaf8b0a..3e94b92af6a 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp @@ -1,5 +1,4 @@ // -*- C++ -*- -// // $Id$ #include "orbsvcs/FaultTolerance/FT_ORBInitializer.h" @@ -9,11 +8,6 @@ #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/Exception.h" - -ACE_RCSID (FaultTolerance, - FT_ORBInitializer, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp index 95f66159e6a..0de8565abfa 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp @@ -7,11 +7,6 @@ #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/Exception.h" - -ACE_RCSID (FaultTolerance, - FT_ServerORBInitializer, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp index 26803b15aaf..3e9074a07c2 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp @@ -1,5 +1,4 @@ // -*- C++ -*- -// // $Id$ #include "orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h" @@ -7,11 +6,6 @@ #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" - -ACE_RCSID (FaultTolerance, - FT_ServerPolicyFactory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Policy_ptr diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index 0e39d335b7a..e34494173a1 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h" #include "tao/IOPC.h" #include "tao/ORB_Constants.h" @@ -8,10 +10,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (FaultTolerance, - FT_ServerRequest_Interceptor, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index e46044243e7..02dec8e7aaa 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -15,11 +15,6 @@ #include "tao/CDR.h" #include "tao/SystemException.h" -ACE_RCSID (FaultTolerance, - FT_Service_Callbacks, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_FT_Service_Callbacks::TAO_FT_Service_Callbacks (TAO_ORB_Core *orb_core) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp index de912b10127..1be01bbea6c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp @@ -3,10 +3,6 @@ #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h" #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h" -ACE_RCSID (ClientORB, - FTRT_ClientORB_Initializer, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL FTRT_ClientORB_Initializer::FTRT_ClientORB_Initializer (int transaction_depth) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp index 0776f22a784..c4e102f6fcc 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp @@ -6,10 +6,6 @@ #include "tao/CDR.h" #include "ace/Log_Msg.h" -ACE_RCSID (ClientORB, - FTRT_ClientORB_Interceptor, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace FTRT { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp index 649f6dff9ea..35b4c304d90 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp @@ -9,11 +9,6 @@ #include "tao/ORBInitializer_Registry.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (ClientORB, - FTRT_ClientORB_Loader, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRT { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index 421709b9748..2bb5c55df40 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -15,10 +15,6 @@ #include "tao/Utils/PolicyList_Destroyer.h" #include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" -ACE_RCSID (EventChannel, - TAO_FTEC_Event_Channel, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_FTEC_Event_Channel::TAO_FTEC_Event_Channel(CORBA::ORB_var orb, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index d44c64cf91d..d9ba04ecf48 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -13,11 +13,6 @@ #include "../Utils/Safe_InputCDR.h" #include "orbsvcs/FtRtecEventCommC.h" - -ACE_RCSID (EventChannel, - FTEC_Event_Channel_Impl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void obtain_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp index c0bb7566afa..2290a1bebfd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp @@ -1,4 +1,5 @@ // $Id$ + #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h" @@ -7,10 +8,6 @@ #include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h" #include "orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h" -ACE_RCSID (EventChannel, - FTEC_Factory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_FTEC_Basic_Factory::TAO_FTEC_Basic_Factory (void) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp index bd1764bfa35..3eb665c6b30 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -10,10 +10,6 @@ #include "tao/CDR.h" #include "orbsvcs/PortableGroup/PG_Operators.h" -ACE_RCSID (EventChannel, - TAO_FTEC_Group_Manager, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int find_by_location(const FTRT::ManagerInfoList& list, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp index 146adb31e89..64aff6a04ba 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp @@ -1,16 +1,11 @@ // $Id$ - #include "orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h" #include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h" #include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h" #include "orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h" #include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" -ACE_RCSID (EventChannel, - FTEC_ORBInitializer, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp index 0e37fa35eb5..39a4175c5c5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp @@ -5,10 +5,6 @@ #include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" #include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" -ACE_RCSID (EventChannel, - TAO_FTEC_ProxyPushSupplier, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL const TAO_FTEC_ProxyPushSupplier::RollbackOperation diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp index cbf09a94882..e417eb44182 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp @@ -6,10 +6,6 @@ #include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h" #include "tao/Stub.h" -ACE_RCSID (EventChannel, - TAO_FTEC_SupplierAdmin, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL const FtRtecEventChannelAdmin::OperationType diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index e271bafd421..4793489d99f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -7,10 +7,6 @@ #include "../Utils/Safe_InputCDR.h" #include "../Utils/Log.h" -ACE_RCSID (EventChannel, - FtEventServiceInterceptor, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index de996514b2d..085b909aebc 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -7,13 +7,6 @@ #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h" #include "../Utils/Log.h" -//#include "../Utils/log_obj_endpoints.h" - -ACE_RCSID (EventChannel, - GroupInfoPublisher, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL GroupInfoPublisherBase::GroupInfoPublisherBase() diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index 89dd7b88898..ff3188b6ba6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -12,10 +12,6 @@ #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" -ACE_RCSID (EventChannel, - IOGR_Maker, - "$Id$") - static IOGR_Maker* maker; TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp index ae30ff5a33c..43a7eed3f1a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp @@ -3,11 +3,6 @@ #include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h" #include "../Utils/UUID.h" -ACE_RCSID (EventChannel, - Identification_Service, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace FTRTEC { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp index 08b889297b7..e70726ca265 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp @@ -4,10 +4,6 @@ #include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "orbsvcs/Event/EC_ProxySupplier.h" -ACE_RCSID (EventChannel, - ProxyConsumerStateWorker, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL ProxyConsumerStateWorker::ProxyConsumerStateWorker ( diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp index 8f47fd1c894..8c9e8dce508 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp @@ -5,10 +5,6 @@ #include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "orbsvcs/Event/EC_ProxyConsumer.h" -ACE_RCSID (EventChannel, - ProxySupplierStateWorker, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL ProxySupplierStateWorker::ProxySupplierStateWorker ( diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp index 4f6e0df6b6d..0b660655b2a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp @@ -12,11 +12,6 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_strings.h" - -ACE_RCSID (EventChannel, - Replication_Service, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace FTRTEC diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp index db6c4497c52..357a2396f9b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp @@ -3,11 +3,6 @@ #include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h" #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" -ACE_RCSID (EventChannel, - Replication_Strategy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL Replication_Strategy::Replication_Strategy() diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index ec5adff88bd..ec58a65597d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -10,10 +10,6 @@ #include "tao/AnyTypeCode/IOPA.h" #include "ace/TSS_T.h" -ACE_RCSID (EventChannel, - Request_Context_Repository, - "$Id$") - namespace { PortableInterceptor::SlotId object_id_slot; PortableInterceptor::SlotId cached_result_slot; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp index e92e73dd491..ec06fa1097e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp @@ -9,10 +9,6 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_sys_socket.h" -ACE_RCSID (EventChannel, - SCTP_Fault_Detector, - "$Id$") - #ifndef SCTP_HEARTBEAT_ITVL #define SCTP_HEARTBEAT_ITVL 19 #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp index 69a0e29bb82..2ca0edfa40d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -6,10 +6,6 @@ #include "orbsvcs/FTRTC.h" #include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" -ACE_RCSID (EventChannel, - Set_Update_Intercetpor, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Set_Update_Interceptor::TAO_Set_Update_Interceptor () diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp index 338fae9cf52..db3f9f2877c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp @@ -3,10 +3,6 @@ #include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h" #include "ace/Guard_T.h" -ACE_RCSID (EventChannel, - Update_Manager, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL Update_Manager::Update_Manager(ACE_Auto_Event& evt, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index 93879192db3..7f34610440f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -5,11 +5,6 @@ #include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h" #include "../Utils/resolve_init.h" -ACE_RCSID (EventChannel, - UpdateableHandler, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL UpdateableHandler::UpdateableHandler(AMI_Primary_Replication_Strategy* strategy) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp index 8b902ac91bc..4b684ac136b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp @@ -1,13 +1,10 @@ +// $Id$ + #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" #include "tao/Object_KeyC.h" #include -ACE_RCSID (EventChannel, - replace_key, - "$Id$") - - /// This function was defined in IOGR_Maker.cpp. It is moved /// here because the use of header /// file conflicts with the use of auto_ptr in the diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index 0fbc19919d8..4874c69258d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -5,10 +5,6 @@ #include "orbsvcs/FtRtecEventCommS.h" #include "tao/ORB_Core.h" -ACE_RCSID (Utils, - FTEC_Gateway, - "$Id$") - #if !defined(__ACE_INLINE__) #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp index 96f0abfbad5..efd4b53376c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp @@ -1,8 +1,6 @@ -#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h" +// $Id$ -ACE_RCSID (Utils, - Safe_InputCDR, - "$Id$") +#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h" #if !defined(__ACE_INLINE__) #include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp index 20ff2119ba2..554754c4363 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp @@ -1,9 +1,7 @@ //$Id$ + #include "orbsvcs/FtRtEvent/Utils/UUID.h" -ACE_RCSID (Utils, - UUID, - "$Id$") #if !defined(__ACE_INLINE__) #include "orbsvcs/FtRtEvent/Utils/UUID.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index d2015c7cc80..7ac0578a91f 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -19,10 +19,6 @@ #include "orbsvcs/HTIOP/HTIOP_Acceptor.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(HTIOP, - TAO_HTIOP_Acceptor, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::HTIOP::Acceptor::Acceptor (ACE::HTBP::Environment *ht_env, diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp index c5e411efe7d..a5b8617fd49 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp @@ -16,11 +16,6 @@ #include "tao/Thread_Lane_Resources.h" #include "tao/Acceptor_Impl.h" -ACE_RCSID (HTIOP, - TAO_HTIOP_Completion_Handler, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::HTIOP::Completion_Handler::Completion_Handler (ACE_Thread_Manager *t) diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index 0dcab5ad0f1..c399745db08 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -21,11 +21,6 @@ #include "tao/Resume_Handle.h" #include "tao/Protocols_Hooks.h" -ACE_RCSID (HTIOP, - TAO_HTIOP_Connection_Handler, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::HTIOP::Connection_Handler::Connection_Handler (ACE_Thread_Manager *t) diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index 2adb25fc91a..e0922358d58 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -18,11 +18,6 @@ #include "tao/Profile_Transport_Resolver.h" #include "ace/Strategies_T.h" -ACE_RCSID (HTIOP, - TAO_HTIOP_Connector, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::HTIOP::Connector::Connector (ACE::HTBP::Environment *ht_env) diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp index 0f509ab566f..46bc7c75082 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp @@ -9,11 +9,6 @@ #include "tao/IOPC.h" #include "tao/debug.h" - -ACE_RCSID (HTIOP, - TAO_HTIOP_Endpoint, - "$Id$") - #if !defined (__ACE_INLINE__) # include "orbsvcs/HTIOP/HTIOP_Endpoint.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp index 34ba5a8f8a1..8d04c62e7e7 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp @@ -8,10 +8,6 @@ #include "ace/HTBP/HTBP_Environment.h" #include "tao/IOPC.h" -ACE_RCSID (HTIOP, - TAOHTIOP_Factory, - "$Id$") - static const char the_prefix[] = "htiop"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index d58362ced8f..b69a58ea11e 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -12,10 +12,6 @@ #include "tao/ORB_Core.h" #include "tao/debug.h" -ACE_RCSID(HTIOP, - TAO_HTIOP_Profile, - "$Id$") - static const char the_prefix[] = "htiop"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp index e8b9460fda3..dc829f0ec3a 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -21,10 +21,6 @@ #include "tao/Protocols_Hooks.h" #include "tao/Adapter.h" -ACE_RCSID (HTIOP, - TAO_HTIOP_Transport, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::HTIOP::Transport::Transport (TAO::HTIOP::Connection_Handler *h, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp index 93f65b6b6c8..83b3658a41a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp @@ -3,15 +3,9 @@ #include "orbsvcs/IFRService/AbstractInterfaceDef_i.h" #include "orbsvcs/IFRService/Repository_i.h" -ACE_RCSID (IFRService, - AbstractInterfaceDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_AbstractInterfaceDef_i::TAO_AbstractInterfaceDef_i ( - TAO_Repository_i *repo - ) +TAO_AbstractInterfaceDef_i::TAO_AbstractInterfaceDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Container_i (repo), TAO_Contained_i (repo), diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp index 236eecd9931..c099bfd8005 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp @@ -6,11 +6,6 @@ #include "ace/Auto_Ptr.h" #include "ace/SString.h" - -ACE_RCSID (IFRService, - AliasDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_AliasDef_i::TAO_AliasDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp index 2fd2fa4d562..217dc001d4f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp @@ -6,11 +6,6 @@ #include "ace/Auto_Ptr.h" #include "ace/SString.h" - -ACE_RCSID (IFRService, - ArrayDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ArrayDef_i::TAO_ArrayDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp index f8be90a495a..38e2c4e79f0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp @@ -8,16 +8,9 @@ #include "ace/Auto_Ptr.h" #include "ace/SString.h" - -ACE_RCSID (IFRService, - AttributeDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_AttributeDef_i::TAO_AttributeDef_i ( - TAO_Repository_i *repo - ) +TAO_AttributeDef_i::TAO_AttributeDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo) { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp index e6deb164007..986d20bc47c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp @@ -9,10 +9,6 @@ #include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" -ACE_RCSID (IFRService, - ComponentContainer_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char *TAO_ComponentContainer_i::tmp_name_holder_ = 0; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp index 4efe8c1f0dd..823de5e1217 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp @@ -12,11 +12,6 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - ComponentDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Specialization. @@ -161,7 +156,7 @@ TAO_ComponentDef_i::describe_i (void) this->repo_->config ()->get_string_value (this->section_key_, "base_component", holder); - + if (status == 0) { ACE_Configuration_Section_Key base_key; @@ -173,8 +168,8 @@ TAO_ComponentDef_i::describe_i (void) "id", holder); } - - // If status wasn't 0, holder will contain the empty string. + + // If status wasn't 0, holder will contain the empty string. cd.base_component = holder.fast_rep (); CORBA::ULong count = 0; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp index 474f85baf57..010b1a3f86b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp @@ -2,11 +2,6 @@ #include "orbsvcs/IFRService/ComponentModuleDef_i.h" -ACE_RCSID (IFRService, - ComponentModuleDef_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ComponentModuleDef_i::TAO_ComponentModuleDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp index f361f887fc3..b446b9b2731 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp @@ -14,18 +14,12 @@ #include "orbsvcs/IFRService/ProvidesDef_i.h" #include "orbsvcs/IFRService/UsesDef_i.h" -ACE_RCSID (IFRService, - ComponentRepository_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ComponentRepository_i::TAO_ComponentRepository_i ( CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, - ACE_Configuration *config - ) + ACE_Configuration *config) : TAO_IRObject_i (0), TAO_Container_i (0), TAO_Repository_i (orb, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp index 532c7b4c749..38359a44621 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp @@ -10,17 +10,9 @@ #include "ace/Auto_Ptr.h" #include "ace/SString.h" - -ACE_RCSID (IFRService, - ConstantDef_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ConstantDef_i::TAO_ConstantDef_i ( - TAO_Repository_i *repo - ) +TAO_ConstantDef_i::TAO_ConstantDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo) { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp index 17844ebd678..181f0007e49 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp @@ -1,14 +1,9 @@ // -*- C++ -*- - // $Id$ #include "orbsvcs/IFRService/Repository_i.h" #include "orbsvcs/IFRService/ConsumesDef_i.h" -ACE_RCSID (IFRService, - ConsumesDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ConsumesDef_i::TAO_ConsumesDef_i ( diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp index 85832e59248..13962884ca7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp @@ -6,12 +6,6 @@ #include "ace/Auto_Ptr.h" #include "ace/SString.h" - -ACE_RCSID (IFRService, - Contained_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char *TAO_Contained_i::tmp_name_holder_ = 0; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp index 88b28241e80..722f0a39605 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp @@ -14,18 +14,11 @@ #include "ace/Auto_Ptr.h" #include "ace/SString.h" - -ACE_RCSID (IFRService, - Container_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char *TAO_Container_i::tmp_name_holder_ = 0; -TAO_Container_i::TAO_Container_i ( - TAO_Repository_i *repo - ) +TAO_Container_i::TAO_Container_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo) { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp index 9d3b9fed6f2..e4d3f6bc2a4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp @@ -3,11 +3,6 @@ #include "orbsvcs/IFRService/EmitsDef_i.h" #include "orbsvcs/IFRService/Repository_i.h" -ACE_RCSID (IFRService, - EmitsDef_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EmitsDef_i::TAO_EmitsDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp index 2b80c8608ea..beeaaa4b4f6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp @@ -6,11 +6,6 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - EnumDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EnumDef_i::TAO_EnumDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp index 5e96026a120..e6378e02778 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp @@ -3,11 +3,6 @@ #include "orbsvcs/IFRService/Repository_i.h" #include "orbsvcs/IFRService/EventDef_i.h" -ACE_RCSID (IFRService, - EventDef_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EventDef_i::TAO_EventDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp index 5b45b14ee9b..fb09253aaee 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp @@ -8,11 +8,6 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - EventPortDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EventPortDef_i::TAO_EventPortDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp index 9ec6a018504..987665fe35a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp @@ -7,15 +7,9 @@ #include "ace/Auto_Ptr.h" #include "ace/SString.h" -ACE_RCSID (IFRService, - ExceptionDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ExceptionDef_i::TAO_ExceptionDef_i ( - TAO_Repository_i *repo - ) +TAO_ExceptionDef_i::TAO_ExceptionDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo), TAO_Container_i (repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp index 75bff6fe02b..2833d46a52d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp @@ -3,15 +3,10 @@ #include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h" #include "orbsvcs/IFRService/Repository_i.h" -ACE_RCSID (IFRService, - ExtAbstractInterfaceDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ExtAbstractInterfaceDef_i::TAO_ExtAbstractInterfaceDef_i ( - TAO_Repository_i *repo - ) + TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Container_i (repo), TAO_Contained_i (repo), diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp index 96e511c2419..659c10e789f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp @@ -7,12 +7,6 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - ExtAttributeDef_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ExtAttributeDef_i::TAO_ExtAttributeDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp index 30f003136b2..9c75add9a8e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp @@ -3,16 +3,9 @@ #include "orbsvcs/IFRService/ExtInterfaceDef_i.h" #include "orbsvcs/IFRService/Repository_i.h" -ACE_RCSID (IFRService, - ExtInterfaceDef_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ExtInterfaceDef_i::TAO_ExtInterfaceDef_i ( - TAO_Repository_i *repo - ) +TAO_ExtInterfaceDef_i::TAO_ExtInterfaceDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Container_i (repo), TAO_Contained_i (repo), diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp index c15b0fc00ef..45e40c2113e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp @@ -3,15 +3,9 @@ #include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h" #include "orbsvcs/IFRService/Repository_i.h" -ACE_RCSID (IFRService, - ExtLocalInterfaceDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ExtLocalInterfaceDef_i::TAO_ExtLocalInterfaceDef_i ( - TAO_Repository_i *repo - ) +TAO_ExtLocalInterfaceDef_i::TAO_ExtLocalInterfaceDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Container_i (repo), TAO_Contained_i (repo), diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp index 59e837ef3de..3c07539de7b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp @@ -8,11 +8,6 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - ExtValueDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ExtValueDef_i::TAO_ExtValueDef_i (TAO_Repository_i *repo) @@ -689,7 +684,7 @@ TAO_ExtValueDef_i::describe_ext_value_i ( this->repo_->config ()->get_string_value (this->section_key_, "base_value", holder); - + if (status == 0) { ACE_Configuration_Section_Key base_key; @@ -698,11 +693,11 @@ TAO_ExtValueDef_i::describe_ext_value_i ( base_key, 0); this->repo_->config ()->get_string_value (base_key, - "id", + "id", holder); } - - // If status isn't 0, then holder will be empty anyway. + + // If status isn't 0, then holder will be empty anyway. fv_desc->base_value = holder.fast_rep (); fv_desc->type = this->type_i (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp index e5ca2a5d3ce..8d5746aeb21 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp @@ -3,15 +3,9 @@ #include "orbsvcs/IFRService/Repository_i.h" #include "orbsvcs/IFRService/FactoryDef_i.h" -ACE_RCSID (IFRService, - FactoryDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FactoryDef_i::TAO_FactoryDef_i ( - TAO_Repository_i *repo - ) +TAO_FactoryDef_i::TAO_FactoryDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo), TAO_OperationDef_i (repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp index ea69e2420e7..4bd3c1cdfa9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp @@ -3,11 +3,6 @@ #include "orbsvcs/IFRService/Repository_i.h" #include "orbsvcs/IFRService/FinderDef_i.h" -ACE_RCSID (IFRService, - FinderDef_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_FinderDef_i::TAO_FinderDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp index 0a027ade496..d6595766ee6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp @@ -3,10 +3,6 @@ #include "orbsvcs/IFRService/Repository_i.h" #include "orbsvcs/IFRService/FixedDef_i.h" -ACE_RCSID (IFRService, - FixedDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_FixedDef_i::TAO_FixedDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp index 7e8838fdee0..04f1a001796 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp @@ -12,12 +12,6 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - HomeDef_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_HomeDef_i::TAO_HomeDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp index 83c64aff90e..7bf02f0ae7a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp @@ -2,11 +2,6 @@ #include "orbsvcs/IFRService/IDLType_i.h" -ACE_RCSID (IFRService, - IDLType_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IDLType_i::TAO_IDLType_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp index 4eca36e724d..eacb3615531 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp @@ -14,10 +14,6 @@ #include "ace/Dynamic_Service.h" #include "ace/Argv_Type_Converter.h" -ACE_RCSID (IFR_Service, - IFR_Service_Loader, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IFR_Service_Loader::TAO_IFR_Service_Loader (void) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index 28accc13147..25a9f53f62f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -18,10 +18,6 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_fcntl.h" -ACE_RCSID (IFR_Service, - IFR_Service, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Repository_i *TAO_IFR_Service_Utils::repo_ = 0; @@ -352,11 +348,11 @@ TAO_IFR_Server::create_repository (void) repo_ref); // Write our IOR to a file. - + FILE *output_file_ = ACE_OS::fopen (OPTIONS::instance ()->ior_output_file (), ACE_TEXT ("w")); - + if (output_file_ == 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -585,7 +581,7 @@ TAO_IFR_Service_Utils::id_exists (const char *id, { // The repo id must not already exist. ACE_TString holder; - + if (repo->config ()->get_string_value (repo->repo_ids_key (), id, holder) @@ -791,8 +787,8 @@ TAO_IFR_Service_Utils::valid_creation ( { TAO_IFR_Service_Utils::valid_container (container_kind, contained_kind); - - /// IDL modules can be reopened, and thus pre-exist. + + /// IDL modules can be reopened, and thus pre-exist. if (contained_kind == CORBA::dk_Module) { return; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp index 4add4020c6f..71420458e5e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp @@ -10,12 +10,6 @@ #include "tao/PortableServer/POA_Current_Impl.h" #include "tao/TSS_Resources.h" - -ACE_RCSID (IFR_Service, - IRObject_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IRObject_i::TAO_IRObject_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp index 6865c8e0262..14f30134bf7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp @@ -10,18 +10,12 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - InterfaceAttrExtension_i, - "$Id$") - // ===================================================================== TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_InterfaceAttrExtension_i::TAO_InterfaceAttrExtension_i ( - TAO_Repository_i *repo - ) + TAO_Repository_i *repo) : TAO_IRObject_i (repo) { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp index f824d563205..ac79f5c8673 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp @@ -9,16 +9,9 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - InterfaceDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_InterfaceDef_i::TAO_InterfaceDef_i ( - TAO_Repository_i *repo - ) +TAO_InterfaceDef_i::TAO_InterfaceDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Container_i (repo), TAO_Contained_i (repo), diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp index 31eeced9bf2..23a9aaaf2f1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp @@ -3,15 +3,9 @@ #include "orbsvcs/IFRService/LocalInterfaceDef_i.h" #include "orbsvcs/IFRService/Repository_i.h" -ACE_RCSID (IFRService, - LocalInterfaceDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LocalInterfaceDef_i::TAO_LocalInterfaceDef_i ( - TAO_Repository_i *repo - ) +TAO_LocalInterfaceDef_i::TAO_LocalInterfaceDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Container_i (repo), TAO_Contained_i (repo), diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp index 2a31620dd97..a7da3cafef2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp @@ -5,12 +5,6 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - ModuleDef_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ModuleDef_i::TAO_ModuleDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp index d8d76b25cce..b7d0b53a7c5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp @@ -5,12 +5,6 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - NativeDef_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_NativeDef_i::TAO_NativeDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp index 0485f035d34..9048059af33 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp @@ -9,11 +9,6 @@ #include "ace/Auto_Ptr.h" #include "ace/SString.h" - -ACE_RCSID (IFRService, - OperationDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_OperationDef_i::TAO_OperationDef_i ( diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp index 443ddf4d951..8057cb13292 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp @@ -3,15 +3,9 @@ #include "orbsvcs/IFRService/Repository_i.h" #include "orbsvcs/IFRService/PrimitiveDef_i.h" -ACE_RCSID (IFRService, - PrimitiveDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PrimitiveDef_i::TAO_PrimitiveDef_i ( - TAO_Repository_i *repo - ) +TAO_PrimitiveDef_i::TAO_PrimitiveDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_IDLType_i (repo) { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp index 3db08a3d7f6..866e45d72c7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp @@ -8,15 +8,7 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - ProvidesDef_i, - "$Id$") - - -TAO_ProvidesDef_i::TAO_ProvidesDef_i ( - TAO_Repository_i *repo - ) +TAO_ProvidesDef_i::TAO_ProvidesDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo) { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp index a41a77b49df..a56cdb69f33 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp @@ -4,13 +4,7 @@ #include "orbsvcs/IFRService/PublishesDef_i.h" #include "orbsvcs/IFRService/Repository_i.h" -ACE_RCSID (IFRService, - PublishesDef_i, - "$Id$") - -TAO_PublishesDef_i::TAO_PublishesDef_i ( - TAO_Repository_i *repo - ) +TAO_PublishesDef_i::TAO_PublishesDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo), TAO_EventPortDef_i (repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp index a6e4c6a6051..1afe5aa9f03 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp @@ -3,11 +3,6 @@ #include "orbsvcs/IFRService/RecursDef_i.h" -ACE_RCSID (IFRService, - RecursDef_i, - "RecursDef_i.cpp,v 1.1 2004/10/18 09:00:00 SMA Exp") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL //----------------------------------------------------------------------------- diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index 2614268b0b7..7c21b9d2b84 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -13,11 +13,6 @@ #include "ace/Lock_Adapter_T.h" #include "ace/SString.h" -ACE_RCSID (IFR_Service, - Repository_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp index d91db54a12d..ebcb39f0971 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp @@ -7,16 +7,9 @@ #include "ace/Auto_Ptr.h" #include "ace/SString.h" - -ACE_RCSID (IFRService, - SequenceDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_SequenceDef_i::TAO_SequenceDef_i ( - TAO_Repository_i *repo - ) +TAO_SequenceDef_i::TAO_SequenceDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_IDLType_i (repo) { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp index ff0658e0d68..3cf74f3419e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp @@ -5,11 +5,6 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - StringDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_StringDef_i::TAO_StringDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp index 81ac09e3c46..746c02d3d3b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp @@ -8,11 +8,6 @@ #include "ace/Auto_Ptr.h" #include "ace/SString.h" - -ACE_RCSID (IFRService, - StructDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_StructDef_i::TAO_StructDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp index 676a6edffc4..21ce6101074 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp @@ -5,16 +5,9 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - TypedefDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_TypedefDef_i::TAO_TypedefDef_i ( - TAO_Repository_i *repo - ) +TAO_TypedefDef_i::TAO_TypedefDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo), TAO_IDLType_i (repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp index 49d896fce26..b8f7c8693fe 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp @@ -11,11 +11,6 @@ #include "ace/Auto_Ptr.h" #include "ace/SString.h" - -ACE_RCSID (IFRService, - UnionDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UnionDef_i::TAO_UnionDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp index 983fc16f60d..e61129af886 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp @@ -7,11 +7,6 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - UsesDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UsesDef_i::TAO_UsesDef_i (TAO_Repository_i *repo) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp index b8d4422d08c..f26ac872e2b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp @@ -7,11 +7,6 @@ #include "ace/Auto_Ptr.h" #include "ace/SString.h" - -ACE_RCSID (IFRService, - ValueBoxDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ValueBoxDef_i::TAO_ValueBoxDef_i ( diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp index ef2dd7b740b..e03411570f4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp @@ -9,11 +9,6 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - ValueDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ValueDef_i::TAO_ValueDef_i (TAO_Repository_i *repo) @@ -741,7 +736,7 @@ TAO_ValueDef_i::is_a_i (const char *id) this->repo_->config ()->get_string_value (this->section_key_, "base_value", holder); - + if (status == 0) { ACE_Configuration_Section_Key base_key; @@ -1276,7 +1271,7 @@ TAO_ValueDef_i::describe_value_i (void) status = this->repo_->config ()->get_string_value (this->section_key_, "base_value", holder); - + if (status == 0) { ACE_Configuration_Section_Key base_key; @@ -1288,8 +1283,8 @@ TAO_ValueDef_i::describe_value_i (void) "id", holder); } - - // If status isn't 0, then holder will contain empty string anyway. + + // If status isn't 0, then holder will contain empty string anyway. fv_desc->base_value = holder.fast_rep (); fv_desc->type = this->type_i (); @@ -1692,7 +1687,7 @@ TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc) this->repo_->config ()->get_string_value (this->section_key_, "base_value", holder); - + if (status == 0) { ACE_Configuration_Section_Key base_key; @@ -1704,8 +1699,8 @@ TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc) "id", holder); } - - // If status isn't 0, then holder will be empty anyway. + + // If status isn't 0, then holder will be empty anyway. desc.base_value = holder.fast_rep (); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp index 3403dbd29f7..a0684102f15 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp @@ -8,16 +8,9 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - ValueMemberDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ValueMemberDef_i::TAO_ValueMemberDef_i ( - TAO_Repository_i *repo - ) +TAO_ValueMemberDef_i::TAO_ValueMemberDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo) { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp index 7b51625cbc3..5fb533bf8c0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp @@ -5,16 +5,9 @@ #include "ace/SString.h" - -ACE_RCSID (IFRService, - WstringDef_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_WstringDef_i::TAO_WstringDef_i ( - TAO_Repository_i *repo - ) +TAO_WstringDef_i::TAO_WstringDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_IDLType_i (repo) { diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp index 747a031b5ce..55c3adf82d4 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index 96b28757543..099762d2e15 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_time.h" @@ -10,10 +12,6 @@ #include #endif -ACE_RCSID (LoadBalancing, - LB_CPU_Load_Average_Monitor, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor ( diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index 35d2952619c..e575f720b12 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_time.h" @@ -7,10 +9,6 @@ #include "ace/os_include/os_netdb.h" #include "ace/os_include/sys/os_loadavg.h" -ACE_RCSID (LoadBalancing, - LB_CPU_Utilization_Monitor, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL double calc_cpu_loading (void) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp index dbac81329a8..f4b24ada9ec 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp @@ -1,13 +1,11 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_ClientComponent.h" #include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h" #include "tao/ORB_Constants.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (LoadBalancing, - LB_ClientComponent, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp index 06ef0a6907c..e864c5988d1 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp @@ -1,12 +1,9 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h" #include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h" - #include "tao/ORB_Constants.h" -ACE_RCSID (LoadBalancing, - LB_ClientORBInitializer, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp index 9ea672e8414..ebc3a86b345 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp @@ -1,12 +1,8 @@ -#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h" +// $Id$ +#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h" #include "orbsvcs/CosLoadBalancingC.h" - -ACE_RCSID (LoadBalancing, - TAO_LB_ClientRequestInterceptor, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL char * diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp index a5a5e4666ca..41217b5c678 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_Component.h" #include "orbsvcs/LoadBalancing/LB_ORBInitializer.h" @@ -5,10 +7,6 @@ #include "tao/ORBInitializer_Registry.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (LoadBalancing, - LB_Component, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp index 3b7127dcd43..150cc923d20 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_IORInterceptor.h" #include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h" #include "orbsvcs/LoadBalancing/LB_LoadAlert.h" @@ -5,10 +7,6 @@ #include "tao/debug.h" #include "tao/ORB_Constants.h" -ACE_RCSID (LoadBalancing, - LB_IORInterceptor, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_IORInterceptor::TAO_LB_IORInterceptor ( diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index f9969b33d6a..cc6012cb617 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_LeastLoaded.h" #include "orbsvcs/LoadBalancing/LB_LoadMap.h" #include "orbsvcs/LoadBalancing/LB_Random.h" @@ -10,12 +12,6 @@ #include "ace/Null_Mutex.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (LoadBalancing, - LB_LeastLoaded, - "$Id$") - - #if !defined (__ACE_INLINE__) #include "orbsvcs/LoadBalancing/LB_LeastLoaded.inl" #endif /* defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp index 75794766a04..14f936db278 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp @@ -1,9 +1,6 @@ -#include "orbsvcs/LoadBalancing/LB_LoadAlert.h" - +// $Id$ -ACE_RCSID (LoadBalancer, - LB_LoadAlert, - "$Id$") +#include "orbsvcs/LoadBalancing/LB_LoadAlert.h" #if !defined (__ACE_INLINE__) # include "orbsvcs/LoadBalancing/LB_LoadAlert.inl" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp index 0378e9f584e..36c7c466dab 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp @@ -1,10 +1,8 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_LoadAlertInfo.h" #include "orbsvcs/PortableGroup/PG_Operators.h" -ACE_RCSID (LoadBalancing, - LB_LoadAlertInfo, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_LoadAlertInfo::TAO_LB_LoadAlertInfo (void) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp index e62191f1258..f111dda9eb8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp @@ -1,12 +1,8 @@ -#include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h" +// $Id$ +#include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h" #include "tao/debug.h" - -ACE_RCSID (LoadBalancing, - LB_LoadAlert_Handler, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index eea89c9641d..ec23bf32c83 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_LoadAverage.h" #include "orbsvcs/LoadBalancing/LB_LoadMap.h" #include "orbsvcs/LoadBalancing/LB_Random.h" @@ -10,12 +12,6 @@ #include "ace/Null_Mutex.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (LoadBalancing, - LB_LoadAverage, - "$Id$") - - #if !defined (__ACE_INLINE__) #include "orbsvcs/LoadBalancing/LB_LoadAverage.inl" #endif /* defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index c5987c02967..5e3e5b0dadb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_LoadManager.h" #include "orbsvcs/LoadBalancing/LB_MemberLocator.h" #include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h" @@ -22,11 +24,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (LoadBalancing, - LB_LoadManager, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_LoadManager::TAO_LB_LoadManager (int ping_timeout, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 072a257810c..da66afbb718 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_LoadMinimum.h" #include "ace/OS_NS_sys_time.h" #include "orbsvcs/LoadBalancing/LB_LoadMap.h" @@ -11,12 +13,6 @@ #include "ace/Null_Mutex.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (LoadBalancing, - LB_LoadMinimum, - "$Id$") - - #if !defined (__ACE_INLINE__) #include "orbsvcs/LoadBalancing/LB_LoadMinimum.inl" #endif /* defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp index f8e89fb7857..74d0e2e4e1d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp @@ -1,13 +1,10 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_LoadManager.h" #include "orbsvcs/LoadBalancing/LB_MemberLocator.h" #include "tao/debug.h" - -ACE_RCSID (LoadBalancing, - LB_MemberLocator, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_MemberLocator::TAO_LB_MemberLocator ( diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp index 81e9373c6e2..17e3f69d17a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_ORBInitializer.h" #include "orbsvcs/LoadBalancing/LB_IORInterceptor.h" #include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h" @@ -6,11 +8,6 @@ #include "tao/ORB_Constants.h" -ACE_RCSID (LoadBalancing, - LB_ORBInitializer, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_ORBInitializer::TAO_LB_ORBInitializer ( diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index 8ca8ca70b05..4a2b4d8c673 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -1,11 +1,7 @@ -#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h" - -ACE_RCSID (LoadBalancing, - LB_ObjectReferenceFactory, - "$Id$") +// $Id$ +#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h" #include "tao/debug.h" - #include "ace/SString.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp index 1b01771d3b1..1e57e25e8bf 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp @@ -1,14 +1,10 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_Pull_Handler.h" #include "orbsvcs/LoadBalancing/LB_LoadManager.h" #include "tao/debug.h" - -ACE_RCSID (LoadBalancing, - LB_Pull_Handler, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_Pull_Handler::TAO_LB_Pull_Handler (void) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp index 2e85283e384..3eb5533e1f2 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "orbsvcs/LoadBalancing/LB_Random.h" @@ -6,10 +7,6 @@ #include "ace/OS_NS_time.h" #include "ace/os_include/os_netdb.h" -ACE_RCSID (LoadBalancing, - LB_Random, - "$Id$") - #ifdef ACE_HAS_PTHREADS_STD static pthread_once_t tao_lb_once_control = PTHREAD_ONCE_INIT; #endif /* ACE_HAS_PTHREADS_STD */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp index 1fc61e35f72..e1d131551b6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "orbsvcs/LoadBalancing/LB_RoundRobin.h" @@ -7,10 +8,6 @@ #include "tao/debug.h" #include "tao/ORB_Constants.h" -ACE_RCSID (LoadBalancing, - LB_RoundRobin, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_RoundRobin::TAO_LB_RoundRobin (PortableServer::POA_ptr poa) @@ -104,12 +101,12 @@ TAO_LB_RoundRobin::next_member ( // based on the previous location list. It may be invalid // if the list of locations are changed since then. // We need verify if the suggested location is still exist. - // if it does, use it. Otherwise we need look the previous + // if it does, use it. Otherwise we need look the previous // location backwards one by one until we find an existing - // one in current list then use the next location. If not + // one in current list then use the next location. If not // find a match, then start with 0 index. bool found = false; - + for (CORBA::ULong k = i; k > 0 && !found; --k) { for (CORBA::ULong j = 0; j < len && !found; ++j) @@ -125,15 +122,15 @@ TAO_LB_RoundRobin::next_member ( { i = j + 1; } - + found = true; } } } - + if (!found) i = 0; - + if (len <= i) i = 0; // Reset, i.e. wrap around diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp index ca239bf7a8d..340279af649 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp @@ -1,15 +1,10 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h" #include "orbsvcs/LoadBalancing/LB_LoadAlert.h" - #include "tao/debug.h" - #include "ace/OS_NS_string.h" - -ACE_RCSID (LoadBalancing, - LB_ServerRequestInterceptor, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_ServerRequestInterceptor::TAO_LB_ServerRequestInterceptor ( diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp index f981da120cb..0b63a8e911a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -1,10 +1,8 @@ +// $Id$ + #include "orbsvcs/Log/BasicLogFactory_i.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Log, - BasicLogFactory_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_BasicLogFactory_i::TAO_BasicLogFactory_i (void) diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index 34b690b93b4..4344c106a94 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -1,11 +1,9 @@ +// $Id$ + #include "orbsvcs/Log/BasicLog_i.h" #include "orbsvcs/Log/LogMgr_i.h" -ACE_RCSID (Log, - BasicLog_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_BasicLog_i::TAO_BasicLog_i (CORBA::ORB_ptr orb, diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp index 9cfdcc692e5..148855076df 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp @@ -1,11 +1,9 @@ +// $Id$ + #include "orbsvcs/Log/EventLog_i.h" #include "orbsvcs/Log/LogMgr_i.h" #include "orbsvcs/Log/LogNotification.h" -ACE_RCSID (Log, - EventLogConsumer, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Event_LogConsumer::TAO_Event_LogConsumer (TAO_EventLog_i *log) diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp index 7122a14caaf..824c49bdf1f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp @@ -1,13 +1,11 @@ +// $Id$ + #include "orbsvcs/Log/EventLogFactory_i.h" #include "orbsvcs/Log/LogNotification.h" #include "orbsvcs/Log/EventLogNotification.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Log, - EventLogFactory_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EventLogFactory_i::TAO_EventLogFactory_i (void) diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp index 8320ca9f170..7b3607043d0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp @@ -1,12 +1,10 @@ +// $Id$ + #include "orbsvcs/Log/LogNotification.h" #include "orbsvcs/Log/EventLogNotification.h" #include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" -ACE_RCSID (Log, - EventLogNotification, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EventLogNotification::TAO_EventLogNotification (CosEventChannelAdmin::EventChannel_ptr ec) diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 0da50068a6e..fdfe45cd4b5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -1,12 +1,9 @@ +// $Id$ + #include "orbsvcs/Log/EventLog_i.h" #include "orbsvcs/Log/LogMgr_i.h" #include "orbsvcs/Log/LogNotification.h" -ACE_RCSID (Log, - EventLog_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb, diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp index 1c4c6de1c49..e12cfa7ca78 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp @@ -1,12 +1,10 @@ +// $Id$ + #include "orbsvcs/Log/Hash_Iterator_i.h" #include "orbsvcs/Log/Log_Constraint_Interpreter.h" #include "orbsvcs/Log/Log_Constraint_Visitors.h" #include "orbsvcs/DsLogAdminC.h" -ACE_RCSID (Log, - Hash_Iterator_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Hash_Iterator_i::TAO_Hash_Iterator_i ( diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp index f869551e68c..a1402605a99 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/Log/LogMgr_i.h" #include "orbsvcs/Log/Hash_LogRecordStore.h" #include "orbsvcs/Log/Hash_Iterator_i.h" @@ -10,10 +12,6 @@ #include "tao/debug.h" #include "ace/OS_NS_sys_time.h" -ACE_RCSID (Log, - Hash_LogRecordStore, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore ( diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp index 6f1825b1ee8..f78fcd3feb5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp @@ -1,12 +1,10 @@ +// $Id$ + #include "orbsvcs/Log/Hash_LogStore.h" #include "orbsvcs/Log/Hash_LogRecordStore.h" #include "orbsvcs/Log/LogMgr_i.h" #include "ace/Auto_Ptr.h" -ACE_RCSID (Log, - Hash_LogStore, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Hash_LogStore::TAO_Hash_LogStore(TAO_LogMgr_i* logmgr_i) diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp index 3d8882352c6..fb31e17e4de 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp @@ -1,10 +1,8 @@ +// $Id$ + #include "orbsvcs/Log/Hash_Persistence_Strategy.h" #include "orbsvcs/Log/Hash_LogStore.h" -ACE_RCSID (Log, - Hash_Persistence_Strategy, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Hash_Persistence_Strategy::TAO_Hash_Persistence_Strategy() diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp index 5062b59046c..1030312d93e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -1,9 +1,6 @@ -#include "orbsvcs/Log/Iterator_i.h" - -ACE_RCSID (Log, - Iterator_i, - "$Id$") +// $Id$ +#include "orbsvcs/Log/Iterator_i.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp index eb1a0542208..e55967a9c6f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp @@ -1,8 +1,6 @@ -#include "orbsvcs/Log/LogActivator.h" +// $Id$ -ACE_RCSID (Log, - LogActivator, - "$Id$") +#include "orbsvcs/Log/LogActivator.h" #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "orbsvcs/Log/LogMgr_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index 9cd4fa5be5e..42be2a77a14 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/Log/LogMgr_i.h" #include "orbsvcs/Log/LogActivator.h" #include "ace/Dynamic_Service.h" @@ -6,11 +8,6 @@ #include "orbsvcs/Log/LogStore.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Log, - LogMgr_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LogMgr_i::TAO_LogMgr_i () diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp index 1c1ea76adc9..86f552fc827 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp @@ -1,13 +1,11 @@ +// $Id$ + #include "orbsvcs/Log/LogNotification.h" #include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" #include "ace/OS_NS_sys_time.h" -ACE_RCSID (Log, - LogNotification, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LogNotification::TAO_LogNotification (void) diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp index 278039ac40e..dfea7195131 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp @@ -1,8 +1,6 @@ -#include "orbsvcs/Log/LogRecordStore.h" +// $Id$ -ACE_RCSID (Log, - LogRecordStore, - "$Id$") +#include "orbsvcs/Log/LogRecordStore.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp index 361a2b53ef4..c1dd0b9b418 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp @@ -1,12 +1,9 @@ +// $Id$ + #include "orbsvcs/Log/Log_Compaction_Handler.h" #include "orbsvcs/Log/Log_i.h" #include "ace/Reactor.h" -ACE_RCSID (Log, - Log_Compaction_Handler, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Log_Compaction_Handler::TAO_Log_Compaction_Handler (ACE_Reactor* reactor, diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp index c509994c379..529e9a2fca1 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp @@ -1,11 +1,8 @@ -#include "orbsvcs/Log/Log_Constraint_Interpreter.h" +// $Id$ +#include "orbsvcs/Log/Log_Constraint_Interpreter.h" #include "orbsvcs/Log/Log_Constraint_Visitors.h" -ACE_RCSID (Log, - Log_Constraint_Interpreter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter ( diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index cc0788b558a..1d89cec3fb5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/Log/Log_Constraint_Visitors.h" #include "ace/ETCL/ETCL_Constraint.h" @@ -14,10 +16,6 @@ #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" -ACE_RCSID (Log, - Log_Constraint_Visitors, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRecord &rec) @@ -44,7 +42,7 @@ TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRec // Bind an entry for each item in the record's attribute list. CORBA::Long len = rec.attr_list.length (); - + for (CORBA::Long i = 0; i < len; ++i) { this->property_lookup_.bind (ACE_CString (rec.attr_list[i].name, @@ -571,12 +569,12 @@ TAO_Log_Constraint_Visitor::visit_component ( { TAO_ETCL_Literal_Constraint id; this->queue_.dequeue_head (id); - + CORBA::Any *any_ptr = 0; ACE_NEW_RETURN (any_ptr, CORBA::Any, -1); - + any_ptr->replace (id); any_ptr->impl ()->_add_ref (); this->current_member_ = any_ptr; @@ -962,7 +960,7 @@ TAO_Log_Constraint_Visitor::visit_in ( ACE_NEW_RETURN (any_ptr, CORBA::Any, -1); - + CORBA::Any_var component = any_ptr; component->replace (bag); component->impl ()->_add_ref (); @@ -1263,7 +1261,7 @@ TAO_Log_Constraint_Visitor::simple_type_match (int expr_type, default: return false; } - + return true; } diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp index bd4affd95c1..d06f2f32ed6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp @@ -1,10 +1,8 @@ +// $Id$ + #include "orbsvcs/Log/Log_Flush_Handler.h" #include "orbsvcs/Log/Log_i.h" -ACE_RCSID (Log, - Log_Flush_Handler, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Log_Flush_Handler::TAO_Log_Flush_Handler (ACE_Reactor* reactor, diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 466dfce94b3..8f43c54d406 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/Log/Log_i.h" #include "orbsvcs/Log/LogMgr_i.h" #include "orbsvcs/Time_Utilities.h" @@ -7,11 +9,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_sys_time.h" -ACE_RCSID (Log, - Log_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Log Compaction Interval diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index c4bac928a7b..977fee816fa 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -1,11 +1,9 @@ +// $Id$ + #include "orbsvcs/Log/NotifyLog_i.h" #include "orbsvcs/Log/LogMgr_i.h" #include "orbsvcs/Log/LogNotification.h" -ACE_RCSID (Log, - NotifyLogConsumer, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Notify_LogConsumer::TAO_Notify_LogConsumer (TAO_NotifyLog_i *log) diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index 1bae643c4c8..16bce9394ac 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -1,12 +1,10 @@ +// $Id$ + #include "orbsvcs/Log/NotifyLogFactory_i.h" #include "orbsvcs/Log/LogNotification.h" #include "orbsvcs/Log/NotifyLogNotification.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Log, - NotifyLogFactory_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (void) diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp index dc4b8179b12..a3d233de824 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp @@ -1,13 +1,10 @@ +// $Id$ + #include "orbsvcs/Log/LogNotification.h" #include "orbsvcs/Log/NotifyLogNotification.h" #include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" -ACE_RCSID (Log, - NotifyLogNotification, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_NotifyLogNotification::TAO_NotifyLogNotification ( diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index 5c9e1478f86..22c8d52bde5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -1,11 +1,9 @@ +// $Id$ + #include "orbsvcs/Log/NotifyLog_i.h" #include "orbsvcs/Log/LogMgr_i.h" #include "orbsvcs/Log/LogNotification.h" -ACE_RCSID (Log, - NotifyLog_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb, diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp index 1ad4bf75e82..da181905372 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/Log/RTEventLog_i.h" #include "orbsvcs/Log/LogMgr_i.h" #include "orbsvcs/Log/LogNotification.h" @@ -13,10 +15,6 @@ #include "orbsvcs/Event/EC_SupplierControl.h" #include "ace/Dynamic_Service.h" -ACE_RCSID (Log, - RTEventLogConsumer, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Rtec_LogConsumer::TAO_Rtec_LogConsumer (TAO_RTEventLog_i *log) diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp index 0bd46e91f4f..285165b1315 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/Log/RTEventLogFactory_i.h" #include "orbsvcs/Log/LogNotification.h" #include "orbsvcs/Log/RTEventLogNotification.h" @@ -17,11 +19,6 @@ #include "ace/Auto_Ptr.h" -ACE_RCSID (Log, - RTEventLogFactory_i, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RTEventLogFactory_i::TAO_RTEventLogFactory_i (void) diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp index 14a78477a3b..8493b9c4f93 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/Log/LogNotification.h" #include "orbsvcs/Log/RTEventLogNotification.h" #include "orbsvcs/Time_Utilities.h" @@ -18,10 +20,6 @@ #include "orbsvcs/ESF/ESF_RefCount_Guard.h" #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" -ACE_RCSID (Log, - RTEventLogNotification, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RTEventLogNotification::TAO_RTEventLogNotification ( diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp index 98c04b1dfd5..650b07ee6fb 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/Log/RTEventLog_i.h" #include "orbsvcs/Log/LogMgr_i.h" #include "orbsvcs/Log/LogNotification.h" @@ -13,10 +15,6 @@ #include "orbsvcs/Event/EC_SupplierControl.h" #include "ace/Dynamic_Service.h" -ACE_RCSID (Log, - RTEventLog_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RTEventLog_i::TAO_RTEventLog_i (CORBA::ORB_ptr orb, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp index 2e143e47c8a..f3b6182e33e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp @@ -13,21 +13,12 @@ #include "orbsvcs/Naming/nsconf.h" #include "ace/Auto_Ptr.h" -ACE_RCSID (Naming, - Hash_Naming_Context, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -// ------------------------------------------------- - TAO_Bindings_Map::~TAO_Bindings_Map (void) { } -// ------------------------------------------------- - TAO_Hash_Naming_Context::TAO_Hash_Naming_Context (PortableServer::POA_ptr poa, const char *poa_id) : context_ (0), diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp index ee5a710de0d..08bcaee49f2 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index ae8c95cc794..34a350ac4d7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -29,10 +29,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (Naming, - Naming_Server, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Naming_Server::TAO_Naming_Server (void) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp index 68943e2458e..caa29847f7b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/Naming/Persistent_Naming_Context.h" #include "orbsvcs/Naming/Persistent_Context_Index.h" #include "orbsvcs/Naming/Bindings_Iterator_T.h" @@ -5,15 +7,10 @@ #include "ace/Auto_Ptr.h" -ACE_RCSID (Naming, - Persistent_Naming_Context, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_Persistent_Bindings_Map::unbind (const char *id, - const char *kind) +TAO_Persistent_Bindings_Map::unbind (const char *id, const char *kind) { TAO_Persistent_ExtId name (id, kind); TAO_Persistent_IntId entry; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index 3b9aae5b30b..c31a4a55151 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -3,24 +3,9 @@ #include "tao/debug.h" -// The following #pragma is needed to disable a warning that occurs -// in MSVC 6 due to the overly long debugging symbols generated for -// the ACE_Auto_Basic_Ptr > template -// instance used by some of the methods in this file. -#ifdef _MSC_VER -# pragma warning(disable: 4786) /* identifier was truncated to '255' - characters in the browser - information */ -#endif /* _MSC_VER */ - #include "ace/Auto_Ptr.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Naming, - Storable_Naming_Context, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char * TAO_Storable_Naming_Context::root_name_; diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index 8158c18d21c..9494678b5a0 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp index 51dd6770814..50b4d4a843e 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 823b31def06..40b81c8c3f7 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp index 5d703e0e7cf..e9dcddf977e 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp @@ -6,7 +6,3 @@ #include "orbsvcs/Scheduler_Utilities.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (orbsvcs, - Scheduler_Utilities, - "$Id$") - diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp index 0e7c1a01478..8ee9ee108cd 100644 --- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp @@ -2,16 +2,9 @@ #include "orbsvcs/Security/CSI_Utils.h" #include "orbsvcs/CSIC.h" - #include "tao/CDR.h" - #include "ace/OS_NS_string.h" - -ACE_RCSID (Security, - CSI_Utils, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp index c4473d5e5fa..1519307d289 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp @@ -1,15 +1,9 @@ // -*- C++ -*- +// $Id$ #include "orbsvcs/Security/SL2_EstablishTrustPolicy.h" - #include "tao/ORB_Constants.h" - -ACE_RCSID (Security, - SL2_EstablishTrustPolicy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Security::EstablishTrustPolicy::EstablishTrustPolicy ( diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp index 3d025263540..0aa7c3d65c4 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp @@ -1,15 +1,9 @@ // -*- C++ -*- +// $Id$ #include "orbsvcs/Security/SL2_QOPPolicy.h" - #include "tao/ORB_Constants.h" - -ACE_RCSID (Security, - SL2_QOPPolicy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Security::QOPPolicy::QOPPolicy (::Security::QOP qop) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp index b4a6777ca9e..35a0dc4685b 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp @@ -9,11 +9,6 @@ #include "tao/PortableServer/Object_Adapter.h" #include "tao/PortableServer/Creation_Time.h" -ACE_RCSID (Security, - SL2_SecurityManager, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Security::SecurityManager::SecurityManager (/* unknown */) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp index f37c826cfd1..41fde030644 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp @@ -2,11 +2,6 @@ #include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h" - -ACE_RCSID (Security, - SL3_ContextEstablishmentPolicy, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SL3::ContextEstablishmentPolicy::ContextEstablishmentPolicy ( diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp index 80a5304154e..380cd4f9263 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp @@ -1,9 +1,6 @@ -#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h" - +// $Id$ -ACE_RCSID (Security, - SL3_CredentialsAcquirerFactory, - "$Id$") +#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index 9c89692440f..c62439a3a80 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -3,11 +3,6 @@ #include "orbsvcs/Security/SL3_CredentialsCurator.h" #include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h" - -ACE_RCSID (Security, - SL3_CredentialsCurator, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp index 78ca31f5279..f1940488326 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp @@ -2,12 +2,6 @@ #include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h" - -ACE_RCSID (Security, - SL3_ObjectCredentialsPolicy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SL3::ObjectCredentialsPolicy::ObjectCredentialsPolicy ( diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp index cf05bd9ba75..129ce8fca7f 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp @@ -4,12 +4,6 @@ #include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h" #include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h" - -ACE_RCSID (Security, - SL3_PolicyFactory, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Policy_ptr diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp index faec8ac6679..a31cdef7d67 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp @@ -2,12 +2,6 @@ #include "orbsvcs/Security/SL3_SecurityCurrent.h" - -ACE_RCSID (Security, - SL3_SecurityCurrent, - "$Id$") - - #if !defined (__ACE_INLINE__) # include "orbsvcs/Security/SL3_SecurityCurrent.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp index 14b7a548c16..77208fa2c9e 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp @@ -1,12 +1,8 @@ // -*- C++ -*- +// $Id$ #include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h" -ACE_RCSID (Security, - SL3_Security_Current_Impl, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SL3::SecurityCurrent_Impl::~SecurityCurrent_Impl (void) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp index bb9f8b58bbb..7dee871bd4a 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp @@ -4,12 +4,6 @@ #include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h" #include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h" - -ACE_RCSID (Security, - SL3_SecurityManager, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SL3::SecurityManager::SecurityManager ( diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index 4e77c95f72b..296197f3334 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -1,12 +1,9 @@ // -*- C++ -*- +// $Id$ #include "orbsvcs/Security/Security_Current.h" #include "tao/debug.h" -ACE_RCSID (Security, - Security_Current, - "$Id$") - #if !defined (__ACE_INLINE__) # include "orbsvcs/Security/Security_Current.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp index a0239a9ca7d..6627d37f847 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "orbsvcs/Security/Security_Current_Impl.h" -ACE_RCSID (Security, - SL3_Security_Current_Impl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Security::Current_Impl::~Current_Impl (void) diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index 8c54dca4e95..52a1c563892 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -1,16 +1,10 @@ // -*- C++ -*- +// $Id$ #include "orbsvcs/Security/Security_ORBInitializer.h" -ACE_RCSID (Security, - Security_ORBInitializer, - "$Id$") - - -#if 1 #include "orbsvcs/Security/Security_Current.h" #include "orbsvcs/Security/SL2_SecurityManager.h" -#endif #include "orbsvcs/Security/SL3_SecurityCurrent.h" #include "orbsvcs/Security/SL3_CredentialsCurator.h" #include "orbsvcs/Security/SL3_SecurityManager.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 4d0ff92fb13..9462e58aa60 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -1,11 +1,7 @@ // -*- C++ -*- +// $Id$ #include "orbsvcs/Security/Security_PolicyFactory.h" - -ACE_RCSID (Security, - Security_PolicyFactory, - "$Id$") - #include "orbsvcs/Security/SL2_QOPPolicy.h" #include "orbsvcs/Security/SL2_EstablishTrustPolicy.h" diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp index 0215b3ac111..f4e8c0e1f43 100644 --- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp +++ b/TAO/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/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index 74ef744e13b..a6c436edf00 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/Time/TAO_UTO.h" #include "orbsvcs/Time/TAO_TIO.h" #include "orbsvcs/Time/TAO_Time_Service_Server.h" @@ -6,10 +8,6 @@ #include "tao/debug.h" -ACE_RCSID (Time, - TAO_Time_Service_Server, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Constructor. diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index 1572866de25..f7336b634b3 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -5,12 +5,6 @@ #include "orbsvcs/Time/TAO_TIO.h" #include "ace/OS.h" - -ACE_RCSID (Time, - TAO_UTO, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UTO::TAO_UTO (TimeBase::TimeT time, diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index af7d98e3e3f..744860c67ff 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/Time/Timer_Helper.h" #include "orbsvcs/Time/TAO_Time_Service_Clerk.h" @@ -6,11 +8,6 @@ #include "ace/OS_NS_time.h" #include "ace/OS_NS_sys_time.h" -ACE_RCSID (Time, - Timer_Helper, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL Timer_Helper::Timer_Helper (void) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp index 62213724089..66b85a2da75 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp @@ -9,12 +9,6 @@ #include "ace/OS_NS_string.h" - -ACE_RCSID (Trader, - Constraint_Visitors, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue (void) -- cgit v1.2.1