From 5a75c49fe86990ed55756aa9d3f7996a3d26c97e Mon Sep 17 00:00:00 2001 From: parsons Date: Tue, 5 Apr 2011 16:57:53 +0000 Subject: Updates reflecting changes in ACE since the last checkin. --- ChangeLog | 20 ++++++++++++++++++++ TAO_IDL/be/be_codegen.cpp | 4 ++-- TAO_IDL/be/be_interface.cpp | 8 ++++---- TAO_IDL/be/be_visitor_array/array_ch.cpp | 5 ----- TAO_IDL/util/utl_indenter.cpp | 4 ---- tao/Abstract_Servant_Base.cpp | 4 ---- tao/Acceptor_Filter.cpp | 2 -- tao/Acceptor_Registry.cpp | 5 ----- tao/Adapter.cpp | 4 ---- tao/Adapter_Registry.cpp | 4 ---- tao/AnyTypeCode/Alias_TypeCode_Static.cpp | 4 ---- tao/AnyTypeCode/Any.cpp | 4 ---- tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp | 4 ---- tao/AnyTypeCode/Any_Basic_Impl.cpp | 4 ---- tao/AnyTypeCode/Any_Impl.cpp | 5 ----- tao/AnyTypeCode/Any_SystemException.cpp | 5 ----- tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp | 4 ---- tao/AnyTypeCode/Empty_Param_TypeCode.cpp | 6 ------ tao/AnyTypeCode/Enum_TypeCode_Static.cpp | 5 ----- tao/AnyTypeCode/ExceptionA.cpp | 5 ----- tao/AnyTypeCode/Marshal.cpp | 4 ---- tao/AnyTypeCode/NVList_Adapter_Impl.cpp | 4 ---- tao/AnyTypeCode/Objref_TypeCode_Static.cpp | 5 ----- tao/AnyTypeCode/Sequence_TypeCode_Static.cpp | 5 ----- tao/AnyTypeCode/String_TypeCode_Static.cpp | 6 ------ tao/AnyTypeCode/Struct_TypeCode_Static.cpp | 6 ------ tao/AnyTypeCode/SystemExceptionA.cpp | 5 ----- tao/AnyTypeCode/True_RefCount_Policy.cpp | 5 ----- tao/AnyTypeCode/TypeCodeA.cpp | 6 ------ tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp | 5 ----- tao/AnyTypeCode/TypeCode_Constants.cpp | 6 ------ tao/AnyTypeCode/Union_TypeCode_Static.cpp | 5 ----- tao/AnyTypeCode/Value_TypeCode_Static.cpp | 5 ----- tao/AnyTypeCode/append.cpp | 4 ---- tao/AnyTypeCode/skip.cpp | 4 ---- tao/AnyTypeCode_Adapter.cpp | 4 ---- tao/Asynch_Queued_Message.cpp | 4 ---- tao/Asynch_Reply_Dispatcher_Base.cpp | 4 ---- tao/Base_Transport_Property.cpp | 4 ---- tao/BiDir_Adapter.cpp | 2 -- tao/Bind_Dispatcher_Guard.cpp | 4 ---- tao/Block_Flushing_Strategy.cpp | 2 -- tao/Blocked_Connect_Strategy.cpp | 4 ---- tao/CDR.cpp | 6 ------ tao/CORBALOC_Parser.cpp | 4 ---- tao/CORBANAME_Parser.cpp | 5 ----- tao/CORBA_String.cpp | 12 ++++-------- tao/Cache_Entries_T.cpp | 4 ---- tao/Cleanup_Func_Registry.cpp | 4 ---- tao/ClientRequestInterceptor_Adapter.cpp | 4 ---- tao/ClientRequestInterceptor_Adapter_Factory.cpp | 4 ---- tao/Client_Strategy_Factory.cpp | 2 -- tao/Codeset/Codeset.cpp | 3 --- tao/Codeset/Codeset_Descriptor.cpp | 4 ---- tao/Codeset/Codeset_Manager_Factory.cpp | 2 -- tao/Codeset/Codeset_Manager_i.cpp | 6 ------ tao/Codeset/Codeset_Service_Context_Handler.cpp | 4 ---- tao/Codeset/Codeset_Translator_Factory.cpp | 4 ---- tao/Codeset/UTF16_BOM_Translator.cpp | 7 +------ tao/Codeset_Manager.cpp | 4 ---- tao/Codeset_Manager_Factory_Base.cpp | 4 ---- tao/Codeset_Translator_Base.cpp | 4 ---- tao/Collocated_Invocation.cpp | 5 ----- tao/Collocation_Proxy_Broker.cpp | 6 ------ tao/Collocation_Resolver.cpp | 4 ---- tao/Configurable_Refcount.cpp | 3 --- tao/Connect_Strategy.cpp | 4 ---- tao/Connection_Handler.cpp | 4 ---- tao/Connection_Purging_Strategy.cpp | 4 ---- tao/Connector_Registry.cpp | 5 ----- tao/DLL_Parser.cpp | 4 ---- tao/Default_Collocation_Resolver.cpp | 4 ---- tao/Default_Endpoint_Selector_Factory.cpp | 6 ------ tao/Default_Stub_Factory.cpp | 4 ---- tao/Default_Thread_Lane_Resources_Manager.cpp | 6 ------ tao/Dynamic_Adapter.cpp | 4 ---- tao/Endpoint.cpp | 4 ---- tao/Endpoint_Selector_Factory.cpp | 4 ---- tao/Exception.cpp | 5 ----- tao/Exclusive_TMS.cpp | 4 ---- tao/FILE_Parser.cpp | 4 ---- tao/Fault_Tolerance_Service.cpp | 4 ---- tao/Flushing_Strategy.cpp | 5 ----- tao/GIOP_Message_Base.cpp | 4 ---- tao/GIOP_Message_Generator_Parser.cpp | 6 ------ tao/GIOP_Message_Generator_Parser_10.cpp | 4 ---- tao/GIOP_Message_Generator_Parser_11.cpp | 4 ---- tao/GIOP_Message_Generator_Parser_12.cpp | 4 ---- tao/GIOP_Message_Generator_Parser_Impl.cpp | 3 --- tao/GIOP_Message_Locate_Header.cpp | 3 --- tao/GIOP_Message_State.cpp | 4 ---- tao/GIOP_Message_Version.cpp | 3 --- tao/HTTP_Parser.cpp | 4 ---- tao/IFR_Client_Adapter.cpp | 4 ---- tao/IIOP_Acceptor.cpp | 4 ---- tao/IIOP_Connection_Handler.cpp | 4 ---- tao/IIOP_Connector.cpp | 4 ---- tao/IIOP_Endpoint.cpp | 4 ---- tao/IIOP_Factory.cpp | 5 ----- tao/IIOP_Profile.cpp | 4 ---- tao/IIOP_Transport.cpp | 4 ---- tao/IORInterceptor_Adapter.cpp | 4 ---- tao/IORInterceptor_Adapter_Factory.cpp | 4 ---- tao/IOR_Parser.cpp | 3 --- tao/Incoming_Message_Queue.cpp | 4 ---- tao/Incoming_Message_Stack.cpp | 4 ---- tao/Invocation_Adapter.cpp | 5 ----- tao/Invocation_Base.cpp | 4 ---- tao/Invocation_Endpoint_Selectors.cpp | 7 +------ tao/LF_CH_Event.cpp | 4 ---- tao/LF_Connect_Strategy.cpp | 5 ----- tao/LF_Event.cpp | 4 ---- tao/LF_Event_Binder.cpp | 4 ---- tao/LF_Event_Loop_Thread_Helper.cpp | 3 --- tao/LF_Follower.cpp | 4 ---- tao/LF_Follower_Auto_Adder.cpp | 4 ---- tao/LF_Follower_Auto_Ptr.cpp | 4 ---- tao/LF_Invocation_Event.cpp | 4 ---- tao/LF_Multi_Event.cpp | 5 ----- tao/LF_Strategy.cpp | 4 ---- tao/LF_Strategy_Complete.cpp | 4 ---- tao/LRU_Connection_Purging_Strategy.cpp | 4 ---- tao/Leader_Follower.cpp | 9 ++------- tao/Leader_Follower.inl | 2 +- tao/Leader_Follower_Flushing_Strategy.cpp | 5 ----- tao/Load_Protocol_Factory_T.h | 4 +--- tao/LocalObject.cpp | 4 ---- tao/LocateRequest_Invocation.cpp | 4 ---- tao/LocateRequest_Invocation_Adapter.cpp | 4 ---- tao/MCAST_Parser.cpp | 7 ------- tao/MProfile.cpp | 4 ---- tao/Muxed_TMS.cpp | 4 ---- tao/NVList_Adapter.cpp | 4 ---- tao/Network_Priority_Protocols_Hooks.cpp | 4 ---- tao/New_Leader_Generator.cpp | 6 ------ tao/ORB.cpp | 4 ---- tao/ORBInitializer_Registry.cpp | 5 ----- tao/ORBInitializer_Registry_Adapter.cpp | 4 ---- tao/ORB_Core.cpp | 4 ---- tao/ORB_Core_Auto_Ptr.cpp | 4 ---- tao/ORB_Table.cpp | 6 ------ tao/ObjectKey_Table.cpp | 5 ----- tao/Object_KeyC.cpp | 4 ++-- tao/Object_KeyC.h | 16 ++++++++-------- tao/Object_Loader.cpp | 5 ----- tao/Object_Proxy_Broker.cpp | 4 ---- tao/Object_Ref_Table.cpp | 5 ----- tao/Parser_Registry.cpp | 4 ---- tao/Pluggable_Messaging_Utils.cpp | 4 ---- tao/PolicyFactory_Registry_Adapter.cpp | 6 ------ tao/PolicyFactory_Registry_Factory.cpp | 4 ---- tao/Policy_Current.cpp | 5 ----- tao/Policy_Current_Impl.cpp | 4 ---- tao/Policy_Manager.cpp | 5 ----- tao/Policy_Set.cpp | 4 ---- tao/Policy_Validator.cpp | 5 ----- tao/PortableServer/Acceptor_Filter_Factory.cpp | 4 ---- tao/PortableServer/Active_Object_Map.cpp | 4 ---- tao/PortableServer/Active_Object_Map_Entry.cpp | 4 ---- tao/PortableServer/Active_Policy_Strategies.cpp | 5 ----- tao/PortableServer/Adapter_Activator.cpp | 4 ---- .../Collocated_Arguments_Converter.cpp | 5 ----- .../Collocated_Object_Proxy_Broker.cpp | 4 ---- tao/PortableServer/Creation_Time.cpp | 4 ---- tao/PortableServer/Default_Acceptor_Filter.cpp | 5 ----- tao/PortableServer/Default_Policy_Validator.cpp | 5 ----- tao/PortableServer/Default_Servant_Dispatcher.cpp | 4 ---- .../Direct_Collocation_Upcall_Wrapper.cpp | 4 ---- tao/PortableServer/IdAssignmentPolicy.cpp | 4 ---- tao/PortableServer/IdAssignmentStrategy.cpp | 5 ----- .../IdAssignmentStrategyFactoryImpl.cpp | 4 ---- tao/PortableServer/IdAssignmentStrategySystem.cpp | 5 ----- tao/PortableServer/IdAssignmentStrategyUser.cpp | 4 ---- tao/PortableServer/IdUniquenessPolicy.cpp | 4 ---- .../IdUniquenessStrategyFactoryImpl.cpp | 4 ---- tao/PortableServer/IdUniquenessStrategyMultiple.cpp | 5 ----- tao/PortableServer/IdUniquenessStrategyUnique.cpp | 5 ----- .../IdUniquenessStrategyUniqueFactoryImpl.cpp | 4 ---- tao/PortableServer/ImR_Client_Adapter.cpp | 4 ---- tao/PortableServer/ImplicitActivationPolicy.cpp | 4 ---- tao/PortableServer/ImplicitActivationStrategy.cpp | 4 ---- .../ImplicitActivationStrategyExplicit.cpp | 4 ---- .../ImplicitActivationStrategyFactoryImpl.cpp | 4 ---- .../ImplicitActivationStrategyImplicit.cpp | 4 ---- tao/PortableServer/Key_Adapters.cpp | 4 ---- tao/PortableServer/LifespanPolicy.cpp | 4 ---- tao/PortableServer/LifespanStrategy.cpp | 4 ---- tao/PortableServer/LifespanStrategyFactoryImpl.cpp | 4 ---- tao/PortableServer/LifespanStrategyPersistent.cpp | 4 ---- .../LifespanStrategyPersistentFactoryImpl.cpp | 4 ---- tao/PortableServer/LifespanStrategyTransient.cpp | 4 ---- .../LifespanStrategyTransientFactoryImpl.cpp | 4 ---- tao/PortableServer/Local_Servant_Base.cpp | 4 ---- tao/PortableServer/Network_Priority_Hook.cpp | 4 ---- tao/PortableServer/Non_Servant_Upcall.cpp | 4 ---- tao/PortableServer/ORT_Adapter_Factory.cpp | 4 ---- tao/PortableServer/Object_Adapter.cpp | 4 ---- tao/PortableServer/Operation_Table.cpp | 4 ---- tao/PortableServer/Operation_Table_Binary_Search.cpp | 4 ---- tao/PortableServer/Operation_Table_Dynamic_Hash.cpp | 4 ---- tao/PortableServer/Operation_Table_Linear_Search.cpp | 4 ---- tao/PortableServer/Operation_Table_Perfect_Hash.cpp | 4 ---- tao/PortableServer/POAManager.cpp | 4 ---- tao/PortableServer/POAManagerFactory.cpp | 4 ---- tao/PortableServer/POA_Cached_Policies.cpp | 4 ---- tao/PortableServer/POA_Current.cpp | 4 ---- tao/PortableServer/POA_Current_Impl.cpp | 4 ---- tao/PortableServer/POA_Guard.cpp | 5 ----- tao/PortableServer/POA_Policy_Set.cpp | 4 ---- tao/PortableServer/PortableServer.cpp | 5 ----- tao/PortableServer/PortableServer_Functions.cpp | 4 ---- tao/PortableServer/PortableServer_WFunctions.cpp | 4 ---- tao/PortableServer/Regular_POA.cpp | 4 ---- tao/PortableServer/RequestProcessingPolicy.cpp | 4 ---- tao/PortableServer/RequestProcessingStrategy.cpp | 5 ----- .../RequestProcessingStrategyAOMOnly.cpp | 4 ---- .../RequestProcessingStrategyAOMOnlyFactoryImpl.cpp | 4 ---- .../RequestProcessingStrategyDefaultServant.cpp | 4 ---- .../RequestProcessingStrategyDefaultServantFI.cpp | 4 ---- .../RequestProcessingStrategyFactoryImpl.cpp | 4 ---- .../RequestProcessingStrategyServantActivator.cpp | 4 ---- .../RequestProcessingStrategyServantActivatorFI.cpp | 4 ---- .../RequestProcessingStrategyServantLocator.cpp | 4 ---- .../RequestProcessingStrategyServantLocatorFI.cpp | 4 ---- .../RequestProcessingStrategyServantManager.cpp | 4 ---- tao/PortableServer/Root_POA.cpp | 4 ---- tao/PortableServer/ServantRetentionPolicy.cpp | 4 ---- .../ServantRetentionStrategyFactoryImpl.cpp | 4 ---- .../ServantRetentionStrategyNonRetain.cpp | 4 ---- .../ServantRetentionStrategyNonRetainFactoryImpl.cpp | 4 ---- .../ServantRetentionStrategyRetain.cpp | 4 ---- .../ServantRetentionStrategyRetainFactoryImpl.cpp | 4 ---- tao/PortableServer/Servant_Base.cpp | 4 ---- tao/PortableServer/Servant_Dispatcher.cpp | 5 ----- tao/PortableServer/Servant_Upcall.cpp | 4 ---- tao/PortableServer/StrategyFactory.cpp | 4 ---- tao/PortableServer/ThreadPolicy.cpp | 4 ---- tao/PortableServer/ThreadStrategy.cpp | 4 ---- tao/PortableServer/ThreadStrategyFactoryImpl.cpp | 4 ---- tao/PortableServer/ThreadStrategyORBControl.cpp | 4 ---- tao/PortableServer/ThreadStrategySingle.cpp | 4 ---- .../ThreadStrategySingleFactoryImpl.cpp | 4 ---- tao/PortableServer/Upcall_Command.cpp | 5 ----- tao/PortableServer/Upcall_Wrapper.cpp | 4 ---- tao/Profile.cpp | 5 ----- tao/Profile_Transport_Resolver.cpp | 5 ----- tao/Protocol_Factory.cpp | 4 ---- tao/Protocols_Hooks.cpp | 4 ---- tao/QtResource.mpc | 2 +- tao/Queued_Data.cpp | 4 ---- tao/Queued_Message.cpp | 4 ---- tao/Reactive_Connect_Strategy.cpp | 5 ----- tao/Reactive_Flushing_Strategy.cpp | 5 ----- tao/Refcounted_ObjectKey.cpp | 5 ----- tao/Remote_Invocation.cpp | 4 ---- tao/Remote_Object_Proxy_Broker.cpp | 5 ----- tao/Reply_Dispatcher.cpp | 4 ---- tao/RequestInterceptor_Adapter.cpp | 4 ---- tao/Request_Dispatcher.cpp | 4 ---- tao/Resource_Factory.cpp | 5 ----- tao/Resume_Handle.cpp | 5 ----- tao/ServerRequestInterceptor_Adapter.cpp | 4 ---- tao/ServerRequestInterceptor_Adapter_Factory.cpp | 5 ----- tao/Server_Strategy_Factory.cpp | 5 ----- tao/Service_Callbacks.cpp | 5 ----- tao/Service_Context.cpp | 5 ----- tao/Service_Context_Handler.cpp | 4 ---- tao/Service_Context_Handler_Registry.cpp | 4 ---- tao/Services_Activate.cpp | 4 ---- tao/String_Alloc.cpp | 4 ---- tao/Stub.cpp | 4 ---- tao/Stub_Factory.cpp | 4 ---- tao/Synch_Invocation.cpp | 6 ------ tao/Synch_Queued_Message.cpp | 4 ---- tao/Synch_Reply_Dispatcher.cpp | 5 ----- tao/SystemException.cpp | 6 ------ tao/TAO_Internal.cpp | 4 ---- tao/TAO_Server_Request.cpp | 4 ---- tao/TAO_Singleton_Manager.cpp | 4 ---- tao/TSS_Resources.cpp | 5 ----- tao/Tagged_Components.cpp | 5 ----- tao/Tagged_Profile.cpp | 4 ---- tao/Thread_Lane_Resources.cpp | 4 ---- tao/Thread_Lane_Resources_Manager.cpp | 4 ---- tao/Thread_Per_Connection_Handler.cpp | 4 ---- tao/Transport.cpp | 5 ----- tao/Transport_Acceptor.cpp | 5 ----- tao/Transport_Cache_Manager_T.cpp | 4 ---- tao/Transport_Connector.cpp | 4 ---- tao/Transport_Descriptor_Interface.cpp | 5 ----- tao/Transport_Mux_Strategy.cpp | 5 ----- tao/Transport_Queueing_Strategies.cpp | 5 ----- tao/Transport_Selection_Guard.cpp | 4 ---- tao/Transport_Timer.cpp | 4 ---- tao/TypeCodeFactory_Adapter.cpp | 4 ---- tao/UserException.cpp | 5 ----- tao/Valuetype_Adapter.cpp | 4 ---- tao/Valuetype_Adapter_Factory.cpp | 4 ---- tao/Wait_On_LF_No_Upcall.cpp | 4 ---- tao/Wait_On_Leader_Follower.cpp | 4 ---- tao/Wait_On_Reactor.cpp | 4 ---- tao/Wait_On_Read.cpp | 4 ---- tao/Wait_Strategy.cpp | 4 ---- tao/debug.cpp | 4 ---- tao/default_client.cpp | 5 ----- tao/default_resource.cpp | 8 +------- tao/default_server.cpp | 4 ---- tao/operation_details.cpp | 4 ---- tao/params.cpp | 4 ---- tao/target_specification.cpp | 3 --- 310 files changed, 48 insertions(+), 1325 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79c560c0fa7..a56aea5763c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Tue Apr 5 16:50:23 UTC 2011 Jeff Parsons + + * tao/*.cpp: + * tao/CodeSet/*.cpp: + * tao/AnyTypeCode/*.cpp: + * tao/PortableServer/*.cpp: + * TAO_IDL/be/be_visitor_array/array_ch.cpp: + * TAO_IDL/util/utl_indenter.cpp: + + Removed ACE_RCSID macros. + + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_interface.cpp: + + Updated use syntax of random seed corresponding to changes in ACE. + + * tao/QtResource.mpc: + + Updated changed in base project name. + Tue Sep 28 17:46:42 UTC 2010 Jeff Parsons * tests/Alt_Mapping/alt_mapping_i.cpp: diff --git a/TAO_IDL/be/be_codegen.cpp b/TAO_IDL/be/be_codegen.cpp index 4ce270982a3..371d8121084 100644 --- a/TAO_IDL/be/be_codegen.cpp +++ b/TAO_IDL/be/be_codegen.cpp @@ -3797,7 +3797,7 @@ TAO_CodeGen::make_rand_extension (char * const t) // ACE_thread_t may be a char* (returned by ACE_OS::thr_self()) so // we need to use a C-style cast as a catch-all in order to use a // static_cast<> to an integral type. - ACE_RANDR_TYPE seed = static_cast (msec); + unsigned int seed = static_cast (msec); // We only care about UTF-8 / ASCII characters in generated // filenames. A UTF-16 or UTF-32 character could potentially cause @@ -3833,7 +3833,7 @@ TAO_CodeGen::make_rand_extension (char * const t) // selection to work for EBCDIC, as well. do { - r = static_cast (coefficient * ACE_OS::rand_r (seed)); + r = static_cast (coefficient * ACE_OS::rand_r (&seed)); } while (!ACE_OS::ace_isalnum (r)); diff --git a/TAO_IDL/be/be_interface.cpp b/TAO_IDL/be/be_interface.cpp index 8f260ee0bd0..1d464a2490f 100644 --- a/TAO_IDL/be/be_interface.cpp +++ b/TAO_IDL/be/be_interface.cpp @@ -1092,13 +1092,13 @@ be_interface::gen_operation_table (const char *flat_name, // obscure chance of even this arriving at colliding filenames // on multiprocessor machines when the IDL compiler was run at // exactly the same time. - ACE_RANDR_TYPE seed = - (static_cast (ACE_OS::time()) - + static_cast (ACE_OS::getpid ())); + unsigned int seed = + (static_cast (ACE_OS::time()) + + static_cast (ACE_OS::getpid ())); ACE_OS::sprintf (temp_file, "%s%d.%d.%s.gperf", idl_global->temp_dir (), - ACE_OS::rand_r (seed), + ACE_OS::rand_r (&seed), ACE_OS::getpid (), flat_name); diff --git a/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO_IDL/be/be_visitor_array/array_ch.cpp index c72ef1b3f13..a1608e904e2 100644 --- a/TAO_IDL/be/be_visitor_array/array_ch.cpp +++ b/TAO_IDL/be/be_visitor_array/array_ch.cpp @@ -12,11 +12,6 @@ */ //============================================================================= - -ACE_RCSID (be_visitor_array, - array_ch, - "$Id$") - // ************************************************************************ // visitor for array declaration in client header // ************************************************************************ diff --git a/TAO_IDL/util/utl_indenter.cpp b/TAO_IDL/util/utl_indenter.cpp index 4f2d2389d07..cecb25a0e2e 100644 --- a/TAO_IDL/util/utl_indenter.cpp +++ b/TAO_IDL/util/utl_indenter.cpp @@ -73,10 +73,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // FUZZ: disable check_for_streams_include #include "ace/streams.h" -ACE_RCSID (util, - utl_indenter, - "$Id$") - /* * Constructors */ diff --git a/tao/Abstract_Servant_Base.cpp b/tao/Abstract_Servant_Base.cpp index 46090112a7e..b63e5f09efe 100644 --- a/tao/Abstract_Servant_Base.cpp +++ b/tao/Abstract_Servant_Base.cpp @@ -2,10 +2,6 @@ #include "tao/Abstract_Servant_Base.h" -ACE_RCSID (tao, - Abstract_Servant_Base, - "$Id$") - #if !defined(__ACE_INLINE__) #include "tao/Abstract_Servant_Base.inl" #endif /* __ACE_INLINE__ */ diff --git a/tao/Acceptor_Filter.cpp b/tao/Acceptor_Filter.cpp index e0412bc4c07..91979f2e3fc 100644 --- a/tao/Acceptor_Filter.cpp +++ b/tao/Acceptor_Filter.cpp @@ -2,8 +2,6 @@ #include "tao/Acceptor_Filter.h" -ACE_RCSID(tao, Acceptor_Filter, "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Acceptor_Filter::~TAO_Acceptor_Filter (void) diff --git a/tao/Acceptor_Registry.cpp b/tao/Acceptor_Registry.cpp index 1e1b85c8be3..3cff0a4c872 100644 --- a/tao/Acceptor_Registry.cpp +++ b/tao/Acceptor_Registry.cpp @@ -24,11 +24,6 @@ #include "tao/Acceptor_Registry.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Acceptor_Registry, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Acceptor_Registry::TAO_Acceptor_Registry (void) diff --git a/tao/Adapter.cpp b/tao/Adapter.cpp index d85ab3b7bac..2457a4ac145 100644 --- a/tao/Adapter.cpp +++ b/tao/Adapter.cpp @@ -2,10 +2,6 @@ #include "tao/Adapter.h" -ACE_RCSID (tao, - Adapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Adapter::~TAO_Adapter (void) diff --git a/tao/Adapter_Registry.cpp b/tao/Adapter_Registry.cpp index 4b9d5a7a6e2..21ce5a21138 100644 --- a/tao/Adapter_Registry.cpp +++ b/tao/Adapter_Registry.cpp @@ -12,10 +12,6 @@ #include "ace/OS_NS_string.h" #include "ace/CORBA_macros.h" -ACE_RCSID (tao, - Adapter_Registry, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Adapter_Registry::TAO_Adapter_Registry (TAO_ORB_Core *oc) diff --git a/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/tao/AnyTypeCode/Alias_TypeCode_Static.cpp index 8c80bcb81d3..7eef23226ab 100644 --- a/tao/AnyTypeCode/Alias_TypeCode_Static.cpp +++ b/tao/AnyTypeCode/Alias_TypeCode_Static.cpp @@ -15,10 +15,6 @@ #include "ace/Dynamic_Service.h" -ACE_RCSID (AnyTypeCode, - Alias_TypeCode_Static, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool diff --git a/tao/AnyTypeCode/Any.cpp b/tao/AnyTypeCode/Any.cpp index 8cd963b628e..be464e4ac06 100644 --- a/tao/AnyTypeCode/Any.cpp +++ b/tao/AnyTypeCode/Any.cpp @@ -20,10 +20,6 @@ # include "tao/AnyTypeCode/Any.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (AnyTypeCode, - Any, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL using namespace TAO; diff --git a/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index bcd8f3c8680..6c15bc64a35 100644 --- a/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp +++ b/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp @@ -6,10 +6,6 @@ #include "tao/AnyTypeCode/PolicyA.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID (AnyTypeCode, - TAO_AnyTypeCode_Adapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL #define STANDARD_EXCEPTION_LIST \ diff --git a/tao/AnyTypeCode/Any_Basic_Impl.cpp b/tao/AnyTypeCode/Any_Basic_Impl.cpp index 2084f935aa1..6a0f8e9e68d 100644 --- a/tao/AnyTypeCode/Any_Basic_Impl.cpp +++ b/tao/AnyTypeCode/Any_Basic_Impl.cpp @@ -10,10 +10,6 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" -ACE_RCSID (AnyTypeCode, - Any_Basic_Impl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/AnyTypeCode/Any_Impl.cpp b/tao/AnyTypeCode/Any_Impl.cpp index cd8a8925a36..efac2d51297 100644 --- a/tao/AnyTypeCode/Any_Impl.cpp +++ b/tao/AnyTypeCode/Any_Impl.cpp @@ -9,11 +9,6 @@ #include "ace/Guard_T.h" -ACE_RCSID (AnyTypeCode, - Any_Impl, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Any_Impl::Any_Impl (_tao_destructor destructor, diff --git a/tao/AnyTypeCode/Any_SystemException.cpp b/tao/AnyTypeCode/Any_SystemException.cpp index ef44c4ff664..000687597a0 100644 --- a/tao/AnyTypeCode/Any_SystemException.cpp +++ b/tao/AnyTypeCode/Any_SystemException.cpp @@ -13,11 +13,6 @@ #include "ace/Auto_Ptr.h" -ACE_RCSID (AnyTypeCode, - Any_SystemException, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Any_SystemException::Any_SystemException (_tao_destructor destructor, diff --git a/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp index cf5d51f9356..c1370c8f3bb 100644 --- a/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp +++ b/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp @@ -12,10 +12,6 @@ #include "ace/Dynamic_Service.h" #include "ace/OS_NS_string.h" -ACE_RCSID (AnyTypeCode, - Any_Unknown_IDL_Type, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Unknown_IDL_Type::LOCK const diff --git a/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/tao/AnyTypeCode/Empty_Param_TypeCode.cpp index 85ef4a595f1..d7ce265f091 100644 --- a/tao/AnyTypeCode/Empty_Param_TypeCode.cpp +++ b/tao/AnyTypeCode/Empty_Param_TypeCode.cpp @@ -6,12 +6,6 @@ # include "tao/AnyTypeCode/Empty_Param_TypeCode.inl" #endif /* !__ACE_INLINE__ */ - -ACE_RCSID (AnyTypeCode, - Empty_Param_TypeCode, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool diff --git a/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/tao/AnyTypeCode/Enum_TypeCode_Static.cpp index 01fb53a3c4c..9529f8a3cbc 100644 --- a/tao/AnyTypeCode/Enum_TypeCode_Static.cpp +++ b/tao/AnyTypeCode/Enum_TypeCode_Static.cpp @@ -13,11 +13,6 @@ # include "tao/AnyTypeCode/Enum_TypeCode_Static.inl" #endif /* !__ACE_INLINE__ */ - -ACE_RCSID (AnyTypeCode, - Enum_TypeCode_Static, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool diff --git a/tao/AnyTypeCode/ExceptionA.cpp b/tao/AnyTypeCode/ExceptionA.cpp index 4d0d6668a94..e664c46ade1 100644 --- a/tao/AnyTypeCode/ExceptionA.cpp +++ b/tao/AnyTypeCode/ExceptionA.cpp @@ -14,11 +14,6 @@ #include "ace/OS_NS_stdio.h" -ACE_RCSID (AnyTypeCode, - Exception, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Specializations for CORBA::Exception Any operators. diff --git a/tao/AnyTypeCode/Marshal.cpp b/tao/AnyTypeCode/Marshal.cpp index ca5c7b2dfc1..24ff25ac823 100644 --- a/tao/AnyTypeCode/Marshal.cpp +++ b/tao/AnyTypeCode/Marshal.cpp @@ -21,10 +21,6 @@ # include "tao/AnyTypeCode/Marshal.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (AnyTypeCode, - Marshal, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Marshal_Object::~TAO_Marshal_Object (void) diff --git a/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/tao/AnyTypeCode/NVList_Adapter_Impl.cpp index 511b0434c36..5f300356c7e 100644 --- a/tao/AnyTypeCode/NVList_Adapter_Impl.cpp +++ b/tao/AnyTypeCode/NVList_Adapter_Impl.cpp @@ -2,10 +2,6 @@ #include "tao/AnyTypeCode/NVList_Adapter_Impl.h" -ACE_RCSID (AnyTypeCode, - NVList_Adapter_Impl, - "$Id$") - #include "tao/AnyTypeCode/NVList.h" #include "tao/SystemException.h" #include "ace/CORBA_macros.h" diff --git a/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/tao/AnyTypeCode/Objref_TypeCode_Static.cpp index 179d6a684a9..daa71511f60 100644 --- a/tao/AnyTypeCode/Objref_TypeCode_Static.cpp +++ b/tao/AnyTypeCode/Objref_TypeCode_Static.cpp @@ -14,11 +14,6 @@ #include "ace/Dynamic_Service.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (AnyTypeCode, - Objref_TypeCode_Static, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool diff --git a/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp index ff2b2db4bac..1a1956b6c94 100644 --- a/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp +++ b/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp @@ -8,11 +8,6 @@ # include "tao/AnyTypeCode/Sequence_TypeCode_Static.inl" #endif /* !__ACE_INLINE__ */ - -ACE_RCSID (AnyTypeCode, - Sequence_TypeCode_Static, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool diff --git a/tao/AnyTypeCode/String_TypeCode_Static.cpp b/tao/AnyTypeCode/String_TypeCode_Static.cpp index 0ce4bfdf600..5b22568eb84 100644 --- a/tao/AnyTypeCode/String_TypeCode_Static.cpp +++ b/tao/AnyTypeCode/String_TypeCode_Static.cpp @@ -8,12 +8,6 @@ # include "tao/AnyTypeCode/String_TypeCode_Static.inl" #endif /* !__ACE_INLINE__ */ - -ACE_RCSID (AnyTypeCode, - String_TypeCode_Static, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool diff --git a/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/tao/AnyTypeCode/Struct_TypeCode_Static.cpp index 028e5f5571b..d4efe972e6b 100644 --- a/tao/AnyTypeCode/Struct_TypeCode_Static.cpp +++ b/tao/AnyTypeCode/Struct_TypeCode_Static.cpp @@ -14,12 +14,6 @@ #include "ace/Dynamic_Service.h" - -ACE_RCSID (AnyTypeCode, - Struct_TypeCode_Static, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool diff --git a/tao/AnyTypeCode/SystemExceptionA.cpp b/tao/AnyTypeCode/SystemExceptionA.cpp index 61aa6cd380f..db5918a991a 100644 --- a/tao/AnyTypeCode/SystemExceptionA.cpp +++ b/tao/AnyTypeCode/SystemExceptionA.cpp @@ -12,11 +12,6 @@ #include "tao/CORBA_String.h" -ACE_RCSID (AnyTypeCode, - SystemExceptionA, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (THREAD_CANCELLED) diff --git a/tao/AnyTypeCode/True_RefCount_Policy.cpp b/tao/AnyTypeCode/True_RefCount_Policy.cpp index 7c88dcd4577..54b5fbdc354 100644 --- a/tao/AnyTypeCode/True_RefCount_Policy.cpp +++ b/tao/AnyTypeCode/True_RefCount_Policy.cpp @@ -6,11 +6,6 @@ # include "True_RefCount_Policy.inl" #endif /* !__ACE_INLINE__ */ - -ACE_RCSID (AnyTypeCode, - True_RefCount_Policy, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::True_RefCount_Policy::~True_RefCount_Policy (void) diff --git a/tao/AnyTypeCode/TypeCodeA.cpp b/tao/AnyTypeCode/TypeCodeA.cpp index ca3156f5d15..98da5020048 100644 --- a/tao/AnyTypeCode/TypeCodeA.cpp +++ b/tao/AnyTypeCode/TypeCodeA.cpp @@ -3,12 +3,6 @@ #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" - -ACE_RCSID (AnyTypeCode, - TypeCode, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp index ff668fb917e..4d0e0086c15 100644 --- a/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp +++ b/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp @@ -28,11 +28,6 @@ #include "ace/Array_Base.h" #include "ace/Value_Ptr.h" - -ACE_RCSID (AnyTypeCode, - TypeCode_CDR_Extraction, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/AnyTypeCode/TypeCode_Constants.cpp b/tao/AnyTypeCode/TypeCode_Constants.cpp index cc156f63533..0bc1fd47fd9 100644 --- a/tao/AnyTypeCode/TypeCode_Constants.cpp +++ b/tao/AnyTypeCode/TypeCode_Constants.cpp @@ -3,12 +3,6 @@ #include "tao/AnyTypeCode/TypeCode_Constants.h" - -ACE_RCSID (AnyTypeCode, - TypeCode_Constants, - "$Id$") - - #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/Empty_Param_TypeCode.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" diff --git a/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/tao/AnyTypeCode/Union_TypeCode_Static.cpp index 005506f34fe..01ae9019c74 100644 --- a/tao/AnyTypeCode/Union_TypeCode_Static.cpp +++ b/tao/AnyTypeCode/Union_TypeCode_Static.cpp @@ -12,11 +12,6 @@ #include "ace/Value_Ptr.h" #include "ace/CORBA_macros.h" -ACE_RCSID (AnyTypeCode, - Union_TypeCode_Static, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool diff --git a/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/tao/AnyTypeCode/Value_TypeCode_Static.cpp index 84536062264..db03bf03b42 100644 --- a/tao/AnyTypeCode/Value_TypeCode_Static.cpp +++ b/tao/AnyTypeCode/Value_TypeCode_Static.cpp @@ -14,11 +14,6 @@ # include "tao/AnyTypeCode/Value_TypeCode_Static.inl" #endif /* !__ACE_INLINE__ */ - -ACE_RCSID (AnyTypeCode, - Value_TypeCode_Static, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool diff --git a/tao/AnyTypeCode/append.cpp b/tao/AnyTypeCode/append.cpp index cd4a7d18567..4b990b28079 100644 --- a/tao/AnyTypeCode/append.cpp +++ b/tao/AnyTypeCode/append.cpp @@ -29,10 +29,6 @@ #include "ace/Dynamic_Service.h" -ACE_RCSID (AnyTypeCode, - append, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Encode instances of arbitrary data types based only on typecode. diff --git a/tao/AnyTypeCode/skip.cpp b/tao/AnyTypeCode/skip.cpp index c8c4c2ecab8..0741c2e62d5 100644 --- a/tao/AnyTypeCode/skip.cpp +++ b/tao/AnyTypeCode/skip.cpp @@ -29,10 +29,6 @@ #include "ace/Dynamic_Service.h" -ACE_RCSID (AnyTypeCode, - skip, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::traverse_status diff --git a/tao/AnyTypeCode_Adapter.cpp b/tao/AnyTypeCode_Adapter.cpp index d9da63d780f..96f855bed87 100644 --- a/tao/AnyTypeCode_Adapter.cpp +++ b/tao/AnyTypeCode_Adapter.cpp @@ -2,10 +2,6 @@ #include "tao/AnyTypeCode_Adapter.h" -ACE_RCSID (tao, - TAO_AnyTypeCode_Adapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_AnyTypeCode_Adapter::~TAO_AnyTypeCode_Adapter (void) diff --git a/tao/Asynch_Queued_Message.cpp b/tao/Asynch_Queued_Message.cpp index 9ee9a6e8739..d80f07e23ad 100644 --- a/tao/Asynch_Queued_Message.cpp +++ b/tao/Asynch_Queued_Message.cpp @@ -10,10 +10,6 @@ #include "ace/Malloc_Base.h" #include "ace/High_Res_Timer.h" -ACE_RCSID (tao, - Asynch_Queued_Message, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Asynch_Queued_Message::TAO_Asynch_Queued_Message ( diff --git a/tao/Asynch_Reply_Dispatcher_Base.cpp b/tao/Asynch_Reply_Dispatcher_Base.cpp index 1ed5613102e..9e446e1c31b 100644 --- a/tao/Asynch_Reply_Dispatcher_Base.cpp +++ b/tao/Asynch_Reply_Dispatcher_Base.cpp @@ -10,10 +10,6 @@ #include "tao/Asynch_Reply_Dispatcher_Base.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Asynch_Reply_Dispatcher_Base, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Constructor. diff --git a/tao/Base_Transport_Property.cpp b/tao/Base_Transport_Property.cpp index 9433bfa562d..01754449b5a 100644 --- a/tao/Base_Transport_Property.cpp +++ b/tao/Base_Transport_Property.cpp @@ -7,10 +7,6 @@ # include "tao/Base_Transport_Property.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Base_Transport_Property, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Base_Transport_Property::~TAO_Base_Transport_Property (void) diff --git a/tao/BiDir_Adapter.cpp b/tao/BiDir_Adapter.cpp index b564942d5db..4ad90e15473 100644 --- a/tao/BiDir_Adapter.cpp +++ b/tao/BiDir_Adapter.cpp @@ -2,8 +2,6 @@ #include "tao/BiDir_Adapter.h" -ACE_RCSID(tao, BiDir_Adapter, "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_BiDir_Adapter::~TAO_BiDir_Adapter (void) diff --git a/tao/Bind_Dispatcher_Guard.cpp b/tao/Bind_Dispatcher_Guard.cpp index 8acc7125cc1..6afdd4cd2f0 100644 --- a/tao/Bind_Dispatcher_Guard.cpp +++ b/tao/Bind_Dispatcher_Guard.cpp @@ -7,10 +7,6 @@ # include "tao/Bind_Dispatcher_Guard.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - Bind_Dispatcher_Guard, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Guard (CORBA::ULong request_id, diff --git a/tao/Block_Flushing_Strategy.cpp b/tao/Block_Flushing_Strategy.cpp index ce17445599d..da95bb25641 100644 --- a/tao/Block_Flushing_Strategy.cpp +++ b/tao/Block_Flushing_Strategy.cpp @@ -6,8 +6,6 @@ #include "tao/Connection_Handler.h" #include "ace/Countdown_Time.h" -ACE_RCSID(tao, Block_Flushing_Strategy, "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/tao/Blocked_Connect_Strategy.cpp b/tao/Blocked_Connect_Strategy.cpp index 6cd123fcf49..41ef161741a 100644 --- a/tao/Blocked_Connect_Strategy.cpp +++ b/tao/Blocked_Connect_Strategy.cpp @@ -3,10 +3,6 @@ #include "ace/Synch_Options.h" -ACE_RCSID(tao, - Blocked_Connect_Strategy, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Blocked_Connect_Strategy::TAO_Blocked_Connect_Strategy ( diff --git a/tao/CDR.cpp b/tao/CDR.cpp index e2f77d0b30d..1c1b24bc9f3 100644 --- a/tao/CDR.cpp +++ b/tao/CDR.cpp @@ -10,12 +10,6 @@ # include "tao/CDR.inl" #endif /* ! __ACE_INLINE__ */ - -ACE_RCSID (tao, - CDR, - "$Id$") - - #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_CDR_Timeprobe_Description[] = diff --git a/tao/CORBALOC_Parser.cpp b/tao/CORBALOC_Parser.cpp index 901cd0159b3..f34e314fc22 100644 --- a/tao/CORBALOC_Parser.cpp +++ b/tao/CORBALOC_Parser.cpp @@ -20,10 +20,6 @@ #include "tao/CORBALOC_Parser.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - CORBALOC_Parser, - "$Id$") - static const char prefix[] = "corbaloc:"; static const size_t prefix_len = sizeof prefix - 1; static const char rir_token[] = "rir:"; diff --git a/tao/CORBANAME_Parser.cpp b/tao/CORBANAME_Parser.cpp index da944772902..aacbd0264ca 100644 --- a/tao/CORBANAME_Parser.cpp +++ b/tao/CORBANAME_Parser.cpp @@ -15,11 +15,6 @@ #include "ace/SString.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (tao, - CORBANAME_Parser, - "$Id$") - static const char corbaname_prefix[] = "corbaname:"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/CORBA_String.cpp b/tao/CORBA_String.cpp index f1787d50852..aaa20da44ec 100644 --- a/tao/CORBA_String.cpp +++ b/tao/CORBA_String.cpp @@ -12,10 +12,6 @@ # include "tao/CORBA_String.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - CORBA_String, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ************************************************************* @@ -35,7 +31,7 @@ istream & operator>> (istream &is, CORBA::String_var &sv) { is.seekg (0, ios::end); - sv = CORBA::string_alloc (is.tellg ()); + sv = CORBA::string_alloc (static_cast (is.tellg ())); is.seekg (0, ios::beg); is >> sv.inout (); return is; @@ -52,7 +48,7 @@ istream & operator>> (istream &is, CORBA::String_out &so) { is.seekg (0, ios::end); - so = CORBA::string_alloc (is.tellg ()); + so = CORBA::string_alloc (static_cast (is.tellg ())); is.seekg (0, ios::beg); is >> so.ptr (); return is; @@ -81,7 +77,7 @@ operator>> (istream &is, CORBA::WString_var &wsv) { is.seekg (0, ios::end); // @@ is.tellg()/sizeof(CORBA::WChar) instead? - CORBA::ULong const len = is.tellg (); + CORBA::ULong const len = static_cast (is.tellg ()); wsv = CORBA::wstring_alloc (len); is.seekg (0, ios::beg); @@ -120,7 +116,7 @@ operator>> (istream &is, CORBA::WString_out &wso) { is.seekg (0, ios::end); // @@ is.tellg()/sizeof(CORBA::WChar) instead? - const CORBA::ULong len = is.tellg (); + const CORBA::ULong len = static_cast (is.tellg ()); wso = CORBA::wstring_alloc (len); is.seekg (0, ios::beg); diff --git a/tao/Cache_Entries_T.cpp b/tao/Cache_Entries_T.cpp index 21a9d765af6..3c4be4ae8ed 100644 --- a/tao/Cache_Entries_T.cpp +++ b/tao/Cache_Entries_T.cpp @@ -6,10 +6,6 @@ # include "tao/Cache_Entries_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(tao, - Cache_Entries, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/Cleanup_Func_Registry.cpp b/tao/Cleanup_Func_Registry.cpp index 72d4e72d7e7..5597de7531d 100644 --- a/tao/Cleanup_Func_Registry.cpp +++ b/tao/Cleanup_Func_Registry.cpp @@ -6,10 +6,6 @@ #include "ace/Log_Msg.h" -ACE_RCSID (tao, - Cleanup_Func_Registry, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/tao/ClientRequestInterceptor_Adapter.cpp b/tao/ClientRequestInterceptor_Adapter.cpp index bf3d334201e..c5e425c4cd8 100644 --- a/tao/ClientRequestInterceptor_Adapter.cpp +++ b/tao/ClientRequestInterceptor_Adapter.cpp @@ -1,9 +1,5 @@ #include "tao/ClientRequestInterceptor_Adapter.h" -ACE_RCSID (tao, - ClientInterceptorAdapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::ClientRequestInterceptor_Adapter::~ClientRequestInterceptor_Adapter (void) diff --git a/tao/ClientRequestInterceptor_Adapter_Factory.cpp b/tao/ClientRequestInterceptor_Adapter_Factory.cpp index ee3178eea83..7f0347296a5 100644 --- a/tao/ClientRequestInterceptor_Adapter_Factory.cpp +++ b/tao/ClientRequestInterceptor_Adapter_Factory.cpp @@ -1,9 +1,5 @@ #include "tao/ClientRequestInterceptor_Adapter_Factory.h" -ACE_RCSID (tao, - ClientRequestInterceptorAdapterFactory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ClientRequestInterceptor_Adapter_Factory::~TAO_ClientRequestInterceptor_Adapter_Factory (void) diff --git a/tao/Client_Strategy_Factory.cpp b/tao/Client_Strategy_Factory.cpp index da5a118fbbd..9e965da1eca 100644 --- a/tao/Client_Strategy_Factory.cpp +++ b/tao/Client_Strategy_Factory.cpp @@ -2,8 +2,6 @@ #include "tao/Client_Strategy_Factory.h" -ACE_RCSID(tao, Client_Strategy_Factory, "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void) diff --git a/tao/Codeset/Codeset.cpp b/tao/Codeset/Codeset.cpp index ce56549d729..f8e463e0b44 100644 --- a/tao/Codeset/Codeset.cpp +++ b/tao/Codeset/Codeset.cpp @@ -17,9 +17,6 @@ #include "ace/Dynamic_Service.h" - -ACE_RCSID (Codeset, Codeset, "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/tao/Codeset/Codeset_Descriptor.cpp b/tao/Codeset/Codeset_Descriptor.cpp index 703bad8af7c..990a20182c2 100644 --- a/tao/Codeset/Codeset_Descriptor.cpp +++ b/tao/Codeset/Codeset_Descriptor.cpp @@ -21,10 +21,6 @@ #include "ace/Log_Msg.h" #include "tao/debug.h" -ACE_RCSID (Codeset, - Codeset_Manager_i, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Codeset_Descriptor::TAO_Codeset_Descriptor () diff --git a/tao/Codeset/Codeset_Manager_Factory.cpp b/tao/Codeset/Codeset_Manager_Factory.cpp index a4fab0e4d70..83d96135cb6 100644 --- a/tao/Codeset/Codeset_Manager_Factory.cpp +++ b/tao/Codeset/Codeset_Manager_Factory.cpp @@ -15,8 +15,6 @@ #include "ace/Service_Config.h" #include "tao/Codeset/Codeset_Manager_i.h" -ACE_RCSID (Codeset, Codeset_Manager_Factory, "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory (void) diff --git a/tao/Codeset/Codeset_Manager_i.cpp b/tao/Codeset/Codeset_Manager_i.cpp index 998cb3ce4a6..1c1782afb6b 100644 --- a/tao/Codeset/Codeset_Manager_i.cpp +++ b/tao/Codeset/Codeset_Manager_i.cpp @@ -21,12 +21,6 @@ #include "ace/OS_NS_string.h" #include "ace/Service_Config.h" - -ACE_RCSID (Codeset, - Codeset_Manager_i, - "$Id$") - - // These numbers are assigned by the OpenGroup, a database is // available at // diff --git a/tao/Codeset/Codeset_Service_Context_Handler.cpp b/tao/Codeset/Codeset_Service_Context_Handler.cpp index 58b0aa53c46..f3eb865de58 100644 --- a/tao/Codeset/Codeset_Service_Context_Handler.cpp +++ b/tao/Codeset/Codeset_Service_Context_Handler.cpp @@ -2,10 +2,6 @@ #include "tao/Codeset/Codeset_Service_Context_Handler.h" -ACE_RCSID (Codeset, - Codeset_Service_Context_Handler, - "$Id$") - #include "tao/CDR.h" #include "tao/Transport.h" #include "tao/ORB_Core.h" diff --git a/tao/Codeset/Codeset_Translator_Factory.cpp b/tao/Codeset/Codeset_Translator_Factory.cpp index a85b08a7a47..2efbc414373 100644 --- a/tao/Codeset/Codeset_Translator_Factory.cpp +++ b/tao/Codeset/Codeset_Translator_Factory.cpp @@ -19,10 +19,6 @@ #include "tao/Codeset/Codeset_Translator_Factory.h" #include "tao/CDR.h" -ACE_RCSID (Codeset, - Codeset_Translator_Factory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Codeset_Translator_Factory::TAO_Codeset_Translator_Factory () diff --git a/tao/Codeset/UTF16_BOM_Translator.cpp b/tao/Codeset/UTF16_BOM_Translator.cpp index ac0765f147b..81ddaeed56c 100644 --- a/tao/Codeset/UTF16_BOM_Translator.cpp +++ b/tao/Codeset/UTF16_BOM_Translator.cpp @@ -17,12 +17,7 @@ #include "tao/debug.h" #include "ace/Log_Msg.h" -ACE_RCSID (Codeset, - TAO_UTF16_BOM_Translator, - "$Id$") - - - // **************************************************************** +// **************************************************************** typedef ACE_CDR::UShort ACE_UTF16_T; diff --git a/tao/Codeset_Manager.cpp b/tao/Codeset_Manager.cpp index 0402bfc6aea..981387415e3 100644 --- a/tao/Codeset_Manager.cpp +++ b/tao/Codeset_Manager.cpp @@ -3,10 +3,6 @@ #include "tao/Codeset_Manager.h" #include "tao/Codeset_Descriptor_Base.h" -ACE_RCSID (tao, - Codeset_Manager, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Codeset_Manager::~TAO_Codeset_Manager (void) diff --git a/tao/Codeset_Manager_Factory_Base.cpp b/tao/Codeset_Manager_Factory_Base.cpp index f898c3bfe53..fdf38e1eac8 100644 --- a/tao/Codeset_Manager_Factory_Base.cpp +++ b/tao/Codeset_Manager_Factory_Base.cpp @@ -4,10 +4,6 @@ #include "tao/Codeset_Manager.h" #include "tao/Codeset_Manager_Factory_Base.h" -ACE_RCSID (tao, - Codeset_Manager_Factory_Base, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base (void) diff --git a/tao/Codeset_Translator_Base.cpp b/tao/Codeset_Translator_Base.cpp index b6a863d3829..0cc9e86f054 100644 --- a/tao/Codeset_Translator_Base.cpp +++ b/tao/Codeset_Translator_Base.cpp @@ -18,10 +18,6 @@ #include "tao/Codeset_Translator_Base.h" -ACE_RCSID (tao, - Codeset_Translator_Base, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base (void) diff --git a/tao/Collocated_Invocation.cpp b/tao/Collocated_Invocation.cpp index bd696bbbfa8..13520b40370 100644 --- a/tao/Collocated_Invocation.cpp +++ b/tao/Collocated_Invocation.cpp @@ -12,11 +12,6 @@ # include "tao/PortableInterceptorC.h" #endif /*TAO_HAS_INTERCEPTORS */ -ACE_RCSID (tao, - Collocated_Invocation, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/Collocation_Proxy_Broker.cpp b/tao/Collocation_Proxy_Broker.cpp index e2c0653139f..537b1ded05c 100644 --- a/tao/Collocation_Proxy_Broker.cpp +++ b/tao/Collocation_Proxy_Broker.cpp @@ -2,12 +2,6 @@ #include "tao/Collocation_Proxy_Broker.h" - -ACE_RCSID (tao, - Collocation_Proxy_Broker, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Collocation_Proxy_Broker::~Collocation_Proxy_Broker (void) diff --git a/tao/Collocation_Resolver.cpp b/tao/Collocation_Resolver.cpp index 23d15bfc269..055d88c0e65 100644 --- a/tao/Collocation_Resolver.cpp +++ b/tao/Collocation_Resolver.cpp @@ -2,10 +2,6 @@ #include "tao/Collocation_Resolver.h" -ACE_RCSID (tao, - Collocation_Resolver, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Collocation_Resolver::~TAO_Collocation_Resolver (void) diff --git a/tao/Configurable_Refcount.cpp b/tao/Configurable_Refcount.cpp index 44f5f7f6138..dfd8678c08d 100644 --- a/tao/Configurable_Refcount.cpp +++ b/tao/Configurable_Refcount.cpp @@ -4,6 +4,3 @@ # include "Configurable_Refcount.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Configurable_Refcount, - "$Id$") diff --git a/tao/Connect_Strategy.cpp b/tao/Connect_Strategy.cpp index e382a627ffd..eef31253fe0 100644 --- a/tao/Connect_Strategy.cpp +++ b/tao/Connect_Strategy.cpp @@ -3,10 +3,6 @@ #include "tao/Connection_Handler.h" #include "tao/LF_Multi_Event.h" -ACE_RCSID (tao, - Connect_Strategy, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Connect_Strategy::TAO_Connect_Strategy (TAO_ORB_Core *orb_core) diff --git a/tao/Connection_Handler.cpp b/tao/Connection_Handler.cpp index f17f505ebeb..62d6b48633b 100644 --- a/tao/Connection_Handler.cpp +++ b/tao/Connection_Handler.cpp @@ -18,10 +18,6 @@ #include "tao/Connection_Handler.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Connection_Handler, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core) diff --git a/tao/Connection_Purging_Strategy.cpp b/tao/Connection_Purging_Strategy.cpp index 8bcf332a835..239c7a0352d 100644 --- a/tao/Connection_Purging_Strategy.cpp +++ b/tao/Connection_Purging_Strategy.cpp @@ -6,10 +6,6 @@ # include "tao/Connection_Purging_Strategy.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Connection_Purging_Strategy, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Connection_Purging_Strategy::~TAO_Connection_Purging_Strategy (void) diff --git a/tao/Connector_Registry.cpp b/tao/Connector_Registry.cpp index d24db801bb3..619ba114b4c 100644 --- a/tao/Connector_Registry.cpp +++ b/tao/Connector_Registry.cpp @@ -15,11 +15,6 @@ #include "tao/Connector_Registry.inl" #endif /* __ACE_INLINE__ */ - -ACE_RCSID (tao, - Connector_Registry, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Connector_Registry::TAO_Connector_Registry (void) diff --git a/tao/DLL_Parser.cpp b/tao/DLL_Parser.cpp index b08b33bac85..225af3a3f7d 100644 --- a/tao/DLL_Parser.cpp +++ b/tao/DLL_Parser.cpp @@ -15,10 +15,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (tao, - DLL_Parser, - "$Id$") - static const char dll_prefix[] = "DLL:"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/Default_Collocation_Resolver.cpp b/tao/Default_Collocation_Resolver.cpp index 72e16367826..3a95018ada2 100644 --- a/tao/Default_Collocation_Resolver.cpp +++ b/tao/Default_Collocation_Resolver.cpp @@ -2,10 +2,6 @@ #include "tao/Default_Collocation_Resolver.h" -ACE_RCSID (tao, - Default_Collocation_Resolver, - "$Id$") - #include "tao/Object.h" #include "ace/Log_Msg.h" diff --git a/tao/Default_Endpoint_Selector_Factory.cpp b/tao/Default_Endpoint_Selector_Factory.cpp index 8f64a7f6bb3..bccea7d9b21 100644 --- a/tao/Default_Endpoint_Selector_Factory.cpp +++ b/tao/Default_Endpoint_Selector_Factory.cpp @@ -5,12 +5,6 @@ #include "ace/Log_Msg.h" - -ACE_RCSID (tao, - Default_Endpoint_Selector_Factory, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Default_Endpoint_Selector_Factory::TAO_Default_Endpoint_Selector_Factory ( diff --git a/tao/Default_Stub_Factory.cpp b/tao/Default_Stub_Factory.cpp index 03916e10364..89a9f8d812b 100644 --- a/tao/Default_Stub_Factory.cpp +++ b/tao/Default_Stub_Factory.cpp @@ -7,10 +7,6 @@ #include "ace/CORBA_macros.h" #include "ace/Log_Msg.h" -ACE_RCSID (tao, - TAO_Default_Stub_Factory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory (void) diff --git a/tao/Default_Thread_Lane_Resources_Manager.cpp b/tao/Default_Thread_Lane_Resources_Manager.cpp index 60208182270..591a03c3c39 100644 --- a/tao/Default_Thread_Lane_Resources_Manager.cpp +++ b/tao/Default_Thread_Lane_Resources_Manager.cpp @@ -6,12 +6,6 @@ #include "tao/ORB_Core.h" #include "ace/Log_Msg.h" - -ACE_RCSID (tao, - Default_Thread_Lane_Resources_Manager, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Default_Thread_Lane_Resources_Manager::TAO_Default_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core) diff --git a/tao/Dynamic_Adapter.cpp b/tao/Dynamic_Adapter.cpp index 7e4a4ab96aa..d032903f040 100644 --- a/tao/Dynamic_Adapter.cpp +++ b/tao/Dynamic_Adapter.cpp @@ -2,10 +2,6 @@ #include "tao/Dynamic_Adapter.h" -ACE_RCSID (tao, - Dynamic_Adapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Dynamic_Adapter::~TAO_Dynamic_Adapter (void) diff --git a/tao/Endpoint.cpp b/tao/Endpoint.cpp index b751c6fcdb0..0cb19d5ebaa 100644 --- a/tao/Endpoint.cpp +++ b/tao/Endpoint.cpp @@ -7,10 +7,6 @@ #include "tao/Endpoint.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Endpoint, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Endpoint::~TAO_Endpoint (void) diff --git a/tao/Endpoint_Selector_Factory.cpp b/tao/Endpoint_Selector_Factory.cpp index 6fc44b4efcc..3b0f2bdb3d8 100644 --- a/tao/Endpoint_Selector_Factory.cpp +++ b/tao/Endpoint_Selector_Factory.cpp @@ -2,10 +2,6 @@ #include "tao/Endpoint_Selector_Factory.h" -ACE_RCSID (tao, - Endpoint_Selector_Factory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Endpoint_Selector_Factory::~TAO_Endpoint_Selector_Factory (void) diff --git a/tao/Exception.cpp b/tao/Exception.cpp index 5d648d011f8..ad8e979666b 100644 --- a/tao/Exception.cpp +++ b/tao/Exception.cpp @@ -25,11 +25,6 @@ #include "ace/OS_NS_stdio.h" -ACE_RCSID (tao, - Exception, - "$Id$") - - // **************************************************************** TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/Exclusive_TMS.cpp b/tao/Exclusive_TMS.cpp index f8077d17ba8..3d5f604cbb7 100644 --- a/tao/Exclusive_TMS.cpp +++ b/tao/Exclusive_TMS.cpp @@ -5,10 +5,6 @@ #include "tao/debug.h" #include "tao/Transport.h" -ACE_RCSID (tao, - Exclusive_TMS, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_Transport *transport) diff --git a/tao/FILE_Parser.cpp b/tao/FILE_Parser.cpp index 643675b466a..f0cfad69d50 100644 --- a/tao/FILE_Parser.cpp +++ b/tao/FILE_Parser.cpp @@ -13,10 +13,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" -ACE_RCSID (tao, - FILE_Parser, - "$Id$") - static const char file_prefix[] = "file:"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/Fault_Tolerance_Service.cpp b/tao/Fault_Tolerance_Service.cpp index 75aa4511b5b..cee4f82a00a 100644 --- a/tao/Fault_Tolerance_Service.cpp +++ b/tao/Fault_Tolerance_Service.cpp @@ -9,10 +9,6 @@ # include "tao/Fault_Tolerance_Service.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Fault_Tolerance_Service, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Fault_Tolerance_Service::~TAO_Fault_Tolerance_Service (void) diff --git a/tao/Flushing_Strategy.cpp b/tao/Flushing_Strategy.cpp index 6d66ee99975..d6d754daf62 100644 --- a/tao/Flushing_Strategy.cpp +++ b/tao/Flushing_Strategy.cpp @@ -2,11 +2,6 @@ #include "tao/Flushing_Strategy.h" -ACE_RCSID (tao, - Flushing_Strategy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Flushing_Strategy::~TAO_Flushing_Strategy (void) diff --git a/tao/GIOP_Message_Base.cpp b/tao/GIOP_Message_Base.cpp index 30bfe178489..1fd19e2fbef 100644 --- a/tao/GIOP_Message_Base.cpp +++ b/tao/GIOP_Message_Base.cpp @@ -20,10 +20,6 @@ */ //@@ GIOP_MESSAGE_BASE_INCLUDE_ADD_HOOK -ACE_RCSID (tao, - GIOP_Message_Base, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core, diff --git a/tao/GIOP_Message_Generator_Parser.cpp b/tao/GIOP_Message_Generator_Parser.cpp index b33ed9ba70c..6f7e3636df4 100644 --- a/tao/GIOP_Message_Generator_Parser.cpp +++ b/tao/GIOP_Message_Generator_Parser.cpp @@ -7,12 +7,6 @@ #include "tao/CDR.h" #include "ace/Log_Msg.h" - -ACE_RCSID (tao, - GIOP_Message_Gen_Parser, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_GIOP_Message_Generator_Parser::~TAO_GIOP_Message_Generator_Parser (void) diff --git a/tao/GIOP_Message_Generator_Parser_10.cpp b/tao/GIOP_Message_Generator_Parser_10.cpp index 6b7d69a55a1..9734166b7e5 100644 --- a/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/tao/GIOP_Message_Generator_Parser_10.cpp @@ -13,10 +13,6 @@ #include "ace/Log_Msg.h" -ACE_RCSID (tao, - GIOP_Message_Generator_Parser_10, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool diff --git a/tao/GIOP_Message_Generator_Parser_11.cpp b/tao/GIOP_Message_Generator_Parser_11.cpp index 016a12626c7..98a3b89d501 100644 --- a/tao/GIOP_Message_Generator_Parser_11.cpp +++ b/tao/GIOP_Message_Generator_Parser_11.cpp @@ -1,9 +1,5 @@ #include "tao/GIOP_Message_Generator_Parser_11.h" -ACE_RCSID (tao, - GIOP_Message_Generator_Parser_11, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Octet diff --git a/tao/GIOP_Message_Generator_Parser_12.cpp b/tao/GIOP_Message_Generator_Parser_12.cpp index 5f3e3b061ec..d4003bb3ca5 100644 --- a/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/tao/GIOP_Message_Generator_Parser_12.cpp @@ -12,10 +12,6 @@ #include "tao/Transport.h" #include "tao/CDR.h" -ACE_RCSID (tao, - GIOP_Message_Gen_Parser_12, - "$Id$") - // This is used by GIOP1.2. This is to align the message body on a // 8-octet boundary. This is declared static so that it is in file // scope. diff --git a/tao/GIOP_Message_Generator_Parser_Impl.cpp b/tao/GIOP_Message_Generator_Parser_Impl.cpp index 37842a51970..e267668e10b 100644 --- a/tao/GIOP_Message_Generator_Parser_Impl.cpp +++ b/tao/GIOP_Message_Generator_Parser_Impl.cpp @@ -4,6 +4,3 @@ # include "tao/GIOP_Message_Generator_Parser_Impl.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - GIOP_Message_Generator_Parser_Impl, - "$Id$") diff --git a/tao/GIOP_Message_Locate_Header.cpp b/tao/GIOP_Message_Locate_Header.cpp index 4694fc651eb..06da7d61ca6 100644 --- a/tao/GIOP_Message_Locate_Header.cpp +++ b/tao/GIOP_Message_Locate_Header.cpp @@ -6,6 +6,3 @@ # include "tao/GIOP_Message_Locate_Header.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - GIOP_Message_Locate_Header, - "$Id$") diff --git a/tao/GIOP_Message_State.cpp b/tao/GIOP_Message_State.cpp index c4265219b9d..c9ff4f18ce5 100644 --- a/tao/GIOP_Message_State.cpp +++ b/tao/GIOP_Message_State.cpp @@ -10,10 +10,6 @@ # include "tao/GIOP_Message_State.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - GIOP_Message_State, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/tao/GIOP_Message_Version.cpp b/tao/GIOP_Message_Version.cpp index b7935f7ac71..ea1f82343a8 100644 --- a/tao/GIOP_Message_Version.cpp +++ b/tao/GIOP_Message_Version.cpp @@ -5,6 +5,3 @@ # include "tao/GIOP_Message_Version.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - GIOP_Message_Version, - "$Id$") diff --git a/tao/HTTP_Parser.cpp b/tao/HTTP_Parser.cpp index 50ed7114ec0..8c13007d25b 100644 --- a/tao/HTTP_Parser.cpp +++ b/tao/HTTP_Parser.cpp @@ -16,10 +16,6 @@ #include "ace/OS_NS_string.h" #include "ace/CORBA_macros.h" -ACE_RCSID (tao, - HTTP_Parser, - "$Id$") - static const ACE_TCHAR file_prefix[] = ACE_TEXT ("http:"); TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/IFR_Client_Adapter.cpp b/tao/IFR_Client_Adapter.cpp index 1ebfa2ca0df..1f4774f837b 100644 --- a/tao/IFR_Client_Adapter.cpp +++ b/tao/IFR_Client_Adapter.cpp @@ -2,10 +2,6 @@ #include "tao/IFR_Client_Adapter.h" -ACE_RCSID (tao, - IFR_Client_Adapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IFR_Client_Adapter::~TAO_IFR_Client_Adapter () diff --git a/tao/IIOP_Acceptor.cpp b/tao/IIOP_Acceptor.cpp index dc4a87ea631..a7dae19fcf1 100644 --- a/tao/IIOP_Acceptor.cpp +++ b/tao/IIOP_Acceptor.cpp @@ -23,10 +23,6 @@ #include "ace/OS_NS_string.h" #include "ace/os_include/os_netdb.h" -ACE_RCSID (tao, - IIOP_Acceptor, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void) diff --git a/tao/IIOP_Connection_Handler.cpp b/tao/IIOP_Connection_Handler.cpp index 0fc082615c6..4cbbc6a2065 100644 --- a/tao/IIOP_Connection_Handler.cpp +++ b/tao/IIOP_Connection_Handler.cpp @@ -16,10 +16,6 @@ #include "ace/os_include/netinet/os_tcp.h" #include "ace/os_include/os_netdb.h" -ACE_RCSID (tao, - IIOP_Connection_Handler, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/IIOP_Connector.cpp b/tao/IIOP_Connector.cpp index ad16312fc33..13ca96d5803 100644 --- a/tao/IIOP_Connector.cpp +++ b/tao/IIOP_Connector.cpp @@ -19,10 +19,6 @@ #include "ace/OS_NS_time.h" #include "ace/CORBA_macros.h" -ACE_RCSID (tao, - IIOP_Connector, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Uncomment *one* of the the following defines if you want to explicitly induce diff --git a/tao/IIOP_Endpoint.cpp b/tao/IIOP_Endpoint.cpp index 5bb46b20d8d..0b12ab890fb 100644 --- a/tao/IIOP_Endpoint.cpp +++ b/tao/IIOP_Endpoint.cpp @@ -18,10 +18,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (tao, - IIOP_Endpoint, - "$Id$") - #if !defined (__ACE_INLINE__) # include "tao/IIOP_Endpoint.inl" #endif /* __ACE_INLINE__ */ diff --git a/tao/IIOP_Factory.cpp b/tao/IIOP_Factory.cpp index 94d1fe77543..a517ac4683b 100644 --- a/tao/IIOP_Factory.cpp +++ b/tao/IIOP_Factory.cpp @@ -7,11 +7,6 @@ #include "tao/IOPC.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (tao, - IIOP_Factory, - "$Id$") - - static const char the_prefix[] = "iiop"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/IIOP_Profile.cpp b/tao/IIOP_Profile.cpp index 3b82d98c189..1616cc8f8c2 100644 --- a/tao/IIOP_Profile.cpp +++ b/tao/IIOP_Profile.cpp @@ -11,10 +11,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (tao, - IIOP_Profile, - "$Id$") - #include "ace/os_include/os_netdb.h" static const char the_prefix[] = "iiop"; diff --git a/tao/IIOP_Transport.cpp b/tao/IIOP_Transport.cpp index f017d2340a4..b1bb367b6d9 100644 --- a/tao/IIOP_Transport.cpp +++ b/tao/IIOP_Transport.cpp @@ -17,10 +17,6 @@ #include "ace/OS_NS_sys_sendfile.h" -ACE_RCSID (tao, - IIOP_Transport, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler, diff --git a/tao/IORInterceptor_Adapter.cpp b/tao/IORInterceptor_Adapter.cpp index 7759e6793f3..5cb74c50eef 100644 --- a/tao/IORInterceptor_Adapter.cpp +++ b/tao/IORInterceptor_Adapter.cpp @@ -2,10 +2,6 @@ #include "tao/IORInterceptor_Adapter.h" -ACE_RCSID (tao, - IORInterceptor_Adapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IORInterceptor_Adapter::~TAO_IORInterceptor_Adapter (void) diff --git a/tao/IORInterceptor_Adapter_Factory.cpp b/tao/IORInterceptor_Adapter_Factory.cpp index 083299eeb96..ccbcaea3879 100644 --- a/tao/IORInterceptor_Adapter_Factory.cpp +++ b/tao/IORInterceptor_Adapter_Factory.cpp @@ -1,10 +1,6 @@ // $Id$ #include "tao/IORInterceptor_Adapter_Factory.h" -ACE_RCSID (tao, - IORInterceptor_Adapter_Factory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IORInterceptor_Adapter_Factory::~TAO_IORInterceptor_Adapter_Factory (void) diff --git a/tao/IOR_Parser.cpp b/tao/IOR_Parser.cpp index abc812d7f58..931f6ec6064 100644 --- a/tao/IOR_Parser.cpp +++ b/tao/IOR_Parser.cpp @@ -2,9 +2,6 @@ #include "tao/IOR_Parser.h" -ACE_RCSID(tao, IOR_Parser, "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IOR_Parser::~TAO_IOR_Parser (void) diff --git a/tao/Incoming_Message_Queue.cpp b/tao/Incoming_Message_Queue.cpp index 9a473dc5c33..4b9048426ec 100644 --- a/tao/Incoming_Message_Queue.cpp +++ b/tao/Incoming_Message_Queue.cpp @@ -9,10 +9,6 @@ # include "tao/Incoming_Message_Queue.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Incoming_Message_Queue, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue (void) diff --git a/tao/Incoming_Message_Stack.cpp b/tao/Incoming_Message_Stack.cpp index 2d5627fd3d5..85014ad8792 100644 --- a/tao/Incoming_Message_Stack.cpp +++ b/tao/Incoming_Message_Stack.cpp @@ -5,7 +5,3 @@ # include "tao/Incoming_Message_Stack.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Incoming_Message_Stack, - "$Id$") - diff --git a/tao/Invocation_Adapter.cpp b/tao/Invocation_Adapter.cpp index be97899cd77..6e59ee4f56d 100644 --- a/tao/Invocation_Adapter.cpp +++ b/tao/Invocation_Adapter.cpp @@ -20,11 +20,6 @@ # include "tao/Invocation_Adapter.inl" #endif /* __ACE_INLINE__ */ - -ACE_RCSID (tao, - Invocation_Adapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/Invocation_Base.cpp b/tao/Invocation_Base.cpp index 2a82fefcdff..8571d40c0b5 100644 --- a/tao/Invocation_Base.cpp +++ b/tao/Invocation_Base.cpp @@ -15,10 +15,6 @@ # include "tao/Invocation_Base.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Invocation_Base, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace diff --git a/tao/Invocation_Endpoint_Selectors.cpp b/tao/Invocation_Endpoint_Selectors.cpp index 1b9885e5ef6..062a2e20430 100644 --- a/tao/Invocation_Endpoint_Selectors.cpp +++ b/tao/Invocation_Endpoint_Selectors.cpp @@ -9,12 +9,7 @@ #include "tao/ORB_Constants.h" #include "tao/SystemException.h" -ACE_RCSID (tao, - Invocation_Endpoint_Selectors, - "$Id$") - - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector (void) { diff --git a/tao/LF_CH_Event.cpp b/tao/LF_CH_Event.cpp index 85d7175b890..56d48551d51 100644 --- a/tao/LF_CH_Event.cpp +++ b/tao/LF_CH_Event.cpp @@ -4,10 +4,6 @@ #include "tao/Connection_Handler.h" #include "tao/Transport.h" -ACE_RCSID(tao, - LF_Invocation_Event, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LF_CH_Event::TAO_LF_CH_Event (void) diff --git a/tao/LF_Connect_Strategy.cpp b/tao/LF_Connect_Strategy.cpp index a52852f0529..c05735a3b5f 100644 --- a/tao/LF_Connect_Strategy.cpp +++ b/tao/LF_Connect_Strategy.cpp @@ -7,11 +7,6 @@ #include "tao/ORB_Core.h" #include "ace/Synch_Options.h" -ACE_RCSID(tao, - LF_Connect_Strategy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LF_Connect_Strategy::TAO_LF_Connect_Strategy ( diff --git a/tao/LF_Event.cpp b/tao/LF_Event.cpp index f40ccdb1317..e6735132293 100644 --- a/tao/LF_Event.cpp +++ b/tao/LF_Event.cpp @@ -9,10 +9,6 @@ # include "tao/LF_Event.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Event, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LF_Event::TAO_LF_Event (void) diff --git a/tao/LF_Event_Binder.cpp b/tao/LF_Event_Binder.cpp index 6f59f2dd05b..4067f1fdaba 100644 --- a/tao/LF_Event_Binder.cpp +++ b/tao/LF_Event_Binder.cpp @@ -6,10 +6,6 @@ # include "tao/LF_Event_Binder.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Event_Binder, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LF_Event_Binder::~TAO_LF_Event_Binder (void) diff --git a/tao/LF_Event_Loop_Thread_Helper.cpp b/tao/LF_Event_Loop_Thread_Helper.cpp index 7fa8bc352b6..a59cb9a6cbc 100644 --- a/tao/LF_Event_Loop_Thread_Helper.cpp +++ b/tao/LF_Event_Loop_Thread_Helper.cpp @@ -6,6 +6,3 @@ # include "tao/LF_Event_Loop_Thread_Helper.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Event_Loop_Thread_Helper, - "$Id$") diff --git a/tao/LF_Follower.cpp b/tao/LF_Follower.cpp index 9e9cba91522..5ac84b65ca3 100644 --- a/tao/LF_Follower.cpp +++ b/tao/LF_Follower.cpp @@ -7,10 +7,6 @@ # include "tao/LF_Follower.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Follower, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LF_Follower::TAO_LF_Follower (TAO_Leader_Follower &leader_follower) diff --git a/tao/LF_Follower_Auto_Adder.cpp b/tao/LF_Follower_Auto_Adder.cpp index 4798d5c34c7..0c78eff0b80 100644 --- a/tao/LF_Follower_Auto_Adder.cpp +++ b/tao/LF_Follower_Auto_Adder.cpp @@ -6,10 +6,6 @@ # include "tao/LF_Follower_Auto_Adder.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Follower_Auto_Adder, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LF_Follower_Auto_Adder::~TAO_LF_Follower_Auto_Adder (void) diff --git a/tao/LF_Follower_Auto_Ptr.cpp b/tao/LF_Follower_Auto_Ptr.cpp index 7152175eb48..076a5f926ad 100644 --- a/tao/LF_Follower_Auto_Ptr.cpp +++ b/tao/LF_Follower_Auto_Ptr.cpp @@ -6,10 +6,6 @@ # include "tao/LF_Follower_Auto_Ptr.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Follower_Auto_Ptr, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LF_Follower_Auto_Ptr::~TAO_LF_Follower_Auto_Ptr (void) diff --git a/tao/LF_Invocation_Event.cpp b/tao/LF_Invocation_Event.cpp index fc42ec084fc..f19ede1d259 100644 --- a/tao/LF_Invocation_Event.cpp +++ b/tao/LF_Invocation_Event.cpp @@ -1,10 +1,6 @@ // -*- C++ -*- #include "tao/LF_Invocation_Event.h" -ACE_RCSID(tao, - LF_Invocation_Event, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LF_Invocation_Event::TAO_LF_Invocation_Event (void) diff --git a/tao/LF_Multi_Event.cpp b/tao/LF_Multi_Event.cpp index fa55eeeaefd..33974c6e78c 100644 --- a/tao/LF_Multi_Event.cpp +++ b/tao/LF_Multi_Event.cpp @@ -2,13 +2,8 @@ #include "tao/Connection_Handler.h" #include "ace/OS_Memory.h" -ACE_RCSID(tao, - LF_Multi_Event, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LF_Multi_Event::TAO_LF_Multi_Event (void) : TAO_LF_Event (), events_ (0), diff --git a/tao/LF_Strategy.cpp b/tao/LF_Strategy.cpp index 8c30e4b4e96..1cb7fd5997b 100644 --- a/tao/LF_Strategy.cpp +++ b/tao/LF_Strategy.cpp @@ -2,10 +2,6 @@ #include "tao/LF_Strategy.h" -ACE_RCSID (tao, - LF_Strategy, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LF_Strategy::~TAO_LF_Strategy (void) diff --git a/tao/LF_Strategy_Complete.cpp b/tao/LF_Strategy_Complete.cpp index 687067af7c0..0019092a013 100644 --- a/tao/LF_Strategy_Complete.cpp +++ b/tao/LF_Strategy_Complete.cpp @@ -6,10 +6,6 @@ #include "ace/Guard_T.h" #include "ace/Log_Msg.h" -ACE_RCSID (tao, - LF_Strategy_Complete, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LF_Strategy_Complete::~TAO_LF_Strategy_Complete (void) diff --git a/tao/LRU_Connection_Purging_Strategy.cpp b/tao/LRU_Connection_Purging_Strategy.cpp index 2b2b1f9472a..dcc9871c567 100644 --- a/tao/LRU_Connection_Purging_Strategy.cpp +++ b/tao/LRU_Connection_Purging_Strategy.cpp @@ -3,10 +3,6 @@ #include "tao/LRU_Connection_Purging_Strategy.h" #include "tao/Transport.h" -ACE_RCSID (tao, - LRU_Connection_Purging_Strategy, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LRU_Connection_Purging_Strategy::TAO_LRU_Connection_Purging_Strategy ( diff --git a/tao/Leader_Follower.cpp b/tao/Leader_Follower.cpp index 7524068d223..9f62764dc9b 100644 --- a/tao/Leader_Follower.cpp +++ b/tao/Leader_Follower.cpp @@ -17,16 +17,11 @@ # include "tao/Leader_Follower.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - Leader_Follower, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Leader_Follower::~TAO_Leader_Follower (void) { - while (!this->follower_free_list_.empty ()) + while (!this->follower_free_list_.is_empty ()) { TAO_LF_Follower *follower = this->follower_free_list_.pop_front (); delete follower; @@ -44,7 +39,7 @@ TAO_Leader_Follower::~TAO_Leader_Follower (void) TAO_LF_Follower * TAO_Leader_Follower::allocate_follower (void) { - if (!this->follower_free_list_.empty ()) + if (!this->follower_free_list_.is_empty ()) return this->follower_free_list_.pop_front (); TAO_LF_Follower* ptr = 0; diff --git a/tao/Leader_Follower.inl b/tao/Leader_Follower.inl index 47fc78439b2..462a626cf13 100644 --- a/tao/Leader_Follower.inl +++ b/tao/Leader_Follower.inl @@ -33,7 +33,7 @@ TAO_Leader_Follower::get_tss_resources (void) const ACE_INLINE int TAO_Leader_Follower::follower_available (void) const { - return !this->follower_set_.empty (); + return !this->follower_set_.is_empty (); } ACE_INLINE void diff --git a/tao/Leader_Follower_Flushing_Strategy.cpp b/tao/Leader_Follower_Flushing_Strategy.cpp index 5d8fb37a247..e3b6b1accf0 100644 --- a/tao/Leader_Follower_Flushing_Strategy.cpp +++ b/tao/Leader_Follower_Flushing_Strategy.cpp @@ -8,11 +8,6 @@ #include "tao/ORB_Core.h" #include "tao/ORB.h" -ACE_RCSID (tao, - Leader_Follower_Flushing_Strategy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/tao/Load_Protocol_Factory_T.h b/tao/Load_Protocol_Factory_T.h index d161a8e7ef5..8e3556ea3de 100644 --- a/tao/Load_Protocol_Factory_T.h +++ b/tao/Load_Protocol_Factory_T.h @@ -60,9 +60,7 @@ namespace TAO T, -1); - ACE_AUTO_PTR_RESET (safe_protocol_factory, - protocol_factory, - TAO_Protocol_Factory); + ACE_auto_ptr_reset (safe_protocol_factory, protocol_factory); transfer_ownership = true; } diff --git a/tao/LocalObject.cpp b/tao/LocalObject.cpp index 8331a61434c..e4d242f2ece 100644 --- a/tao/LocalObject.cpp +++ b/tao/LocalObject.cpp @@ -14,10 +14,6 @@ #include "ace/Log_Msg.h" #include "ace/Guard_T.h" -ACE_RCSID (tao, - LocalObject, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::LocalObject::~LocalObject (void) diff --git a/tao/LocateRequest_Invocation.cpp b/tao/LocateRequest_Invocation.cpp index 3d97edf6d61..f0c728f33cb 100644 --- a/tao/LocateRequest_Invocation.cpp +++ b/tao/LocateRequest_Invocation.cpp @@ -13,10 +13,6 @@ #include "ace/Countdown_Time.h" -ACE_RCSID (tao, - LocateRequest_Invocation, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/LocateRequest_Invocation_Adapter.cpp b/tao/LocateRequest_Invocation_Adapter.cpp index ee4e1a8de22..f0704b8035f 100644 --- a/tao/LocateRequest_Invocation_Adapter.cpp +++ b/tao/LocateRequest_Invocation_Adapter.cpp @@ -10,10 +10,6 @@ #include "tao/SystemException.h" #include "ace/Service_Config.h" -ACE_RCSID (tao, - LocateRequest_Invocation_Adapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/MCAST_Parser.cpp b/tao/MCAST_Parser.cpp index 722b30fa65b..90b98ad2b31 100644 --- a/tao/MCAST_Parser.cpp +++ b/tao/MCAST_Parser.cpp @@ -16,15 +16,8 @@ #include "tao/MCAST_Parser.inl" #endif /* __ACE_INLINE__ */ - -ACE_RCSID (tao, - MCAST_Parser, - "$Id$") - - static const char mcast_prefix[] = "mcast:"; - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_MCAST_Parser::~TAO_MCAST_Parser (void) diff --git a/tao/MProfile.cpp b/tao/MProfile.cpp index b3e44e89494..9c8a5a4008f 100644 --- a/tao/MProfile.cpp +++ b/tao/MProfile.cpp @@ -11,10 +11,6 @@ #include "ace/Guard_T.h" #include "ace/CORBA_macros.h" -ACE_RCSID (tao, - MProfile, - "$Id$") - #if !defined (__ACE_INLINE__) # include "tao/MProfile.inl" #endif /* __ACE_INLINE__ */ diff --git a/tao/Muxed_TMS.cpp b/tao/Muxed_TMS.cpp index 06036f4f116..81f2fb24a94 100644 --- a/tao/Muxed_TMS.cpp +++ b/tao/Muxed_TMS.cpp @@ -7,10 +7,6 @@ #include "tao/ORB_Core.h" #include "tao/Client_Strategy_Factory.h" -ACE_RCSID (tao, - Muxed_TMS, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_Transport *transport) diff --git a/tao/NVList_Adapter.cpp b/tao/NVList_Adapter.cpp index 063f473ac6d..96dc2e56a31 100644 --- a/tao/NVList_Adapter.cpp +++ b/tao/NVList_Adapter.cpp @@ -2,10 +2,6 @@ #include "tao/NVList_Adapter.h" -ACE_RCSID (tao, - NVList_Adapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_NVList_Adapter::~TAO_NVList_Adapter (void) diff --git a/tao/Network_Priority_Protocols_Hooks.cpp b/tao/Network_Priority_Protocols_Hooks.cpp index 1f8e7ef4297..405e5857433 100644 --- a/tao/Network_Priority_Protocols_Hooks.cpp +++ b/tao/Network_Priority_Protocols_Hooks.cpp @@ -2,10 +2,6 @@ #include "tao/Network_Priority_Protocols_Hooks.h" -ACE_RCSID (tao, - Network_Priority_Protocols_Hooks, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Network_Priority_Protocols_Hooks:: diff --git a/tao/New_Leader_Generator.cpp b/tao/New_Leader_Generator.cpp index 5edd8e55e60..48eaaf76b1d 100644 --- a/tao/New_Leader_Generator.cpp +++ b/tao/New_Leader_Generator.cpp @@ -2,12 +2,6 @@ #include "tao/New_Leader_Generator.h" - -ACE_RCSID (tao, - New_Leader_Generator, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_New_Leader_Generator::~TAO_New_Leader_Generator (void) diff --git a/tao/ORB.cpp b/tao/ORB.cpp index 32d13823e9c..a6452004b50 100644 --- a/tao/ORB.cpp +++ b/tao/ORB.cpp @@ -2,10 +2,6 @@ #include "tao/ORB.h" -ACE_RCSID (tao, - ORB, - "$Id$") - #include "tao/ORB_Table.h" #include "tao/Connector_Registry.h" #include "tao/IOR_Parser.h" diff --git a/tao/ORBInitializer_Registry.cpp b/tao/ORBInitializer_Registry.cpp index 0a38bc35326..10048e23d95 100644 --- a/tao/ORBInitializer_Registry.cpp +++ b/tao/ORBInitializer_Registry.cpp @@ -12,11 +12,6 @@ #include "ace/Recursive_Thread_Mutex.h" #include "ace/Log_Msg.h" -ACE_RCSID (tao, - ORBInitializer_Registry, - "$Id$") - - // **************************************************************** TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/ORBInitializer_Registry_Adapter.cpp b/tao/ORBInitializer_Registry_Adapter.cpp index 1798764e211..222581e8ea6 100644 --- a/tao/ORBInitializer_Registry_Adapter.cpp +++ b/tao/ORBInitializer_Registry_Adapter.cpp @@ -2,10 +2,6 @@ #include "tao/ORBInitializer_Registry_Adapter.h" -ACE_RCSID (tao, - ORBInitializer_Registry_Adapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/ORB_Core.cpp b/tao/ORB_Core.cpp index abf0a372bb7..f8baa918fe0 100644 --- a/tao/ORB_Core.cpp +++ b/tao/ORB_Core.cpp @@ -82,10 +82,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_RCSID (tao, - ORB_Core, - "$Id$") - ACE_STATIC_SVC_DEFINE(TAO_ORB_Core_Static_Resources, ACE_TEXT ("TAO_ORB_Core_Static_Resources"), ACE_SVC_OBJ_T, diff --git a/tao/ORB_Core_Auto_Ptr.cpp b/tao/ORB_Core_Auto_Ptr.cpp index 068897c2c38..7b0a3ac3e68 100644 --- a/tao/ORB_Core_Auto_Ptr.cpp +++ b/tao/ORB_Core_Auto_Ptr.cpp @@ -5,10 +5,6 @@ # include "tao/ORB_Core_Auto_Ptr.inl" #endif /* !__ACE_INLINE */ -ACE_RCSID (tao, - ORB_Core_Auto_Ptr, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ORB_Core_Auto_Ptr::~TAO_ORB_Core_Auto_Ptr (void) diff --git a/tao/ORB_Table.cpp b/tao/ORB_Table.cpp index f4f1d11e236..713f86f2818 100644 --- a/tao/ORB_Table.cpp +++ b/tao/ORB_Table.cpp @@ -9,12 +9,6 @@ #include "ace/SString.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (tao, - ORB_Table, - "$Id$") - - // **************************************************************** TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/ObjectKey_Table.cpp b/tao/ObjectKey_Table.cpp index 94aefcd220b..ac313ce61fa 100644 --- a/tao/ObjectKey_Table.cpp +++ b/tao/ObjectKey_Table.cpp @@ -4,11 +4,6 @@ #include "tao/ORB_Core.h" #include "tao/Refcounted_ObjectKey.h" -ACE_RCSID(tao, - ObjectKey_Table, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool diff --git a/tao/Object_KeyC.cpp b/tao/Object_KeyC.cpp index 41617ec9b09..0572ff1a84e 100644 --- a/tao/Object_KeyC.cpp +++ b/tao/Object_KeyC.cpp @@ -26,7 +26,7 @@ **/ // TAO_IDL - Generated from -// .\be\be_codegen.cpp:426 +// w:\tao\tao_idl\be\be_codegen.cpp:426 #include "Object_KeyC.h" @@ -38,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from -// .\be\be_visitor_arg_traits.cpp:68 +// w:\tao\tao_idl\be\be_visitor_arg_traits.cpp:68 TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/tao/Object_KeyC.h b/tao/Object_KeyC.h index 313b85f67ab..1da6fdf49b6 100644 --- a/tao/Object_KeyC.h +++ b/tao/Object_KeyC.h @@ -26,10 +26,10 @@ **/ // TAO_IDL - Generated from -// .\be\be_codegen.cpp:149 +// w:\tao\tao_idl\be\be_codegen.cpp:149 -#ifndef _TAO_PIDL_OBJECT_KEYC_GNYJHL_H_ -#define _TAO_PIDL_OBJECT_KEYC_GNYJHL_H_ +#ifndef _TAO_PIDL_OBJECT_KEYC_3VLM1R_H_ +#define _TAO_PIDL_OBJECT_KEYC_3VLM1R_H_ #include /**/ "ace/pre.h" @@ -64,23 +64,23 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from -// w:\tao\tao_idl\be\be_visitor_module/module_ch.cpp:41 +// w:\tao\tao_idl\be\be_visitor_module\module_ch.cpp:41 namespace TAO { // TAO_IDL - Generated from - // w:\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:462 + // w:\tao\tao_idl\be\be_visitor_typedef\typedef_ch.cpp:462 typedef CORBA::OctetSeq ObjectKey; // TAO_IDL - Generated from -// w:\tao\tao_idl\be\be_visitor_module/module_ch.cpp:70 +// w:\tao\tao_idl\be\be_visitor_module\module_ch.cpp:70 } // module TAO // TAO_IDL - Generated from -// .\be\be_visitor_traits.cpp:60 +// w:\tao\tao_idl\be\be_visitor_traits.cpp:60 TAO_END_VERSIONED_NAMESPACE_DECL @@ -101,7 +101,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from -// .\be\be_codegen.cpp:1789 +// w:\tao\tao_idl\be\be_codegen.cpp:1789 TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/tao/Object_Loader.cpp b/tao/Object_Loader.cpp index 5379fa97148..0318b7635fd 100644 --- a/tao/Object_Loader.cpp +++ b/tao/Object_Loader.cpp @@ -2,11 +2,6 @@ #include "tao/Object_Loader.h" -ACE_RCSID (tao, - Object_Loader, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Object_Loader::~TAO_Object_Loader (void) diff --git a/tao/Object_Proxy_Broker.cpp b/tao/Object_Proxy_Broker.cpp index 8a8a1d6ee09..1f2a8687961 100644 --- a/tao/Object_Proxy_Broker.cpp +++ b/tao/Object_Proxy_Broker.cpp @@ -2,10 +2,6 @@ #include "tao/Object_Proxy_Broker.h" -ACE_RCSID (tao, - Object_Proxy_Broker, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Object_Proxy_Broker::~Object_Proxy_Broker (void) diff --git a/tao/Object_Ref_Table.cpp b/tao/Object_Ref_Table.cpp index b40b3cded00..549696f49ca 100644 --- a/tao/Object_Ref_Table.cpp +++ b/tao/Object_Ref_Table.cpp @@ -8,11 +8,6 @@ #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" - -ACE_RCSID (tao, - Object_Ref_Table, - "$Id$") - #ifndef __ACE_INLINE__ # include "tao/Object_Ref_Table.inl" #endif /* __ACE_INLINE__ */ diff --git a/tao/Parser_Registry.cpp b/tao/Parser_Registry.cpp index 87647d3c0f7..b2b85a1ae1d 100644 --- a/tao/Parser_Registry.cpp +++ b/tao/Parser_Registry.cpp @@ -10,10 +10,6 @@ #include "tao/Parser_Registry.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Parser_Registry, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Parser_Registry::TAO_Parser_Registry (void) diff --git a/tao/Pluggable_Messaging_Utils.cpp b/tao/Pluggable_Messaging_Utils.cpp index 40fbcb5eebc..e6e8a28c993 100644 --- a/tao/Pluggable_Messaging_Utils.cpp +++ b/tao/Pluggable_Messaging_Utils.cpp @@ -7,10 +7,6 @@ #include "tao/Pluggable_Messaging_Utils.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Pluggable_Messaging_Utils, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Pluggable_Reply_Params::TAO_Pluggable_Reply_Params (TAO_Transport *t) diff --git a/tao/PolicyFactory_Registry_Adapter.cpp b/tao/PolicyFactory_Registry_Adapter.cpp index c33f3a2710e..b8280ac76b0 100644 --- a/tao/PolicyFactory_Registry_Adapter.cpp +++ b/tao/PolicyFactory_Registry_Adapter.cpp @@ -2,12 +2,6 @@ #include "tao/PolicyFactory_Registry_Adapter.h" - -ACE_RCSID (tao, - PolicyFactory_Registry_Adapter, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::PolicyFactory_Registry_Adapter::~PolicyFactory_Registry_Adapter (void) diff --git a/tao/PolicyFactory_Registry_Factory.cpp b/tao/PolicyFactory_Registry_Factory.cpp index 76a51641ae7..155f82be0db 100644 --- a/tao/PolicyFactory_Registry_Factory.cpp +++ b/tao/PolicyFactory_Registry_Factory.cpp @@ -2,10 +2,6 @@ #include "tao/PolicyFactory_Registry_Factory.h" -ACE_RCSID (tao, - PolicyFactory_Registry_Factory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_PolicyFactory_Registry_Factory::~TAO_PolicyFactory_Registry_Factory (void) diff --git a/tao/Policy_Current.cpp b/tao/Policy_Current.cpp index d428c52972e..a66f5dd9f17 100644 --- a/tao/Policy_Current.cpp +++ b/tao/Policy_Current.cpp @@ -10,11 +10,6 @@ # include "tao/Policy_Current.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - Policy_Current, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Policy_Current_Impl & diff --git a/tao/Policy_Current_Impl.cpp b/tao/Policy_Current_Impl.cpp index 6e2c126ada3..f89d702347a 100644 --- a/tao/Policy_Current_Impl.cpp +++ b/tao/Policy_Current_Impl.cpp @@ -8,10 +8,6 @@ # include "tao/Policy_Current_Impl.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - Policy_Manager, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/tao/Policy_Manager.cpp b/tao/Policy_Manager.cpp index d52fee3e61d..734bac0fb7a 100644 --- a/tao/Policy_Manager.cpp +++ b/tao/Policy_Manager.cpp @@ -8,11 +8,6 @@ # include "tao/Policy_Manager.inl" #endif /* ! __ACE_INLINE__ */ - -ACE_RCSID (tao, - Policy_Manager, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::PolicyList diff --git a/tao/Policy_Set.cpp b/tao/Policy_Set.cpp index c19a673301f..297272b99eb 100644 --- a/tao/Policy_Set.cpp +++ b/tao/Policy_Set.cpp @@ -9,10 +9,6 @@ # include "tao/Policy_Set.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - Policy_Set, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope) diff --git a/tao/Policy_Validator.cpp b/tao/Policy_Validator.cpp index 660f63644a4..f7e2fa4cfbc 100644 --- a/tao/Policy_Validator.cpp +++ b/tao/Policy_Validator.cpp @@ -5,11 +5,6 @@ #include "ace/Log_Msg.h" -ACE_RCSID (tao, - Policy_Validator, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Policy_Validator::TAO_Policy_Validator (TAO_ORB_Core &orb_core) diff --git a/tao/PortableServer/Acceptor_Filter_Factory.cpp b/tao/PortableServer/Acceptor_Filter_Factory.cpp index ea683b1130a..d5d7dcfc452 100644 --- a/tao/PortableServer/Acceptor_Filter_Factory.cpp +++ b/tao/PortableServer/Acceptor_Filter_Factory.cpp @@ -3,10 +3,6 @@ #include "tao/PortableServer/Acceptor_Filter_Factory.h" #include "tao/PortableServer/Default_Acceptor_Filter.h" -ACE_RCSID(PortableServer, - Acceptor_Filter_Factory, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/PortableServer/Active_Object_Map.cpp b/tao/PortableServer/Active_Object_Map.cpp index 63da2a07575..7e7b45f1027 100644 --- a/tao/PortableServer/Active_Object_Map.cpp +++ b/tao/PortableServer/Active_Object_Map.cpp @@ -12,10 +12,6 @@ #include "ace/Auto_Ptr.h" #include "ace/CORBA_macros.h" -ACE_RCSID(PortableServer, - Active_Object_Map, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /* static */ diff --git a/tao/PortableServer/Active_Object_Map_Entry.cpp b/tao/PortableServer/Active_Object_Map_Entry.cpp index 8c622b4eaea..61041390c8b 100644 --- a/tao/PortableServer/Active_Object_Map_Entry.cpp +++ b/tao/PortableServer/Active_Object_Map_Entry.cpp @@ -2,10 +2,6 @@ #include "tao/PortableServer/Active_Object_Map_Entry.h" -ACE_RCSID(PortableServer, - Active_Object_Map_Entry, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void) diff --git a/tao/PortableServer/Active_Policy_Strategies.cpp b/tao/PortableServer/Active_Policy_Strategies.cpp index c1981048df9..d88025c8e68 100644 --- a/tao/PortableServer/Active_Policy_Strategies.cpp +++ b/tao/PortableServer/Active_Policy_Strategies.cpp @@ -33,11 +33,6 @@ # include "tao/PortableServer/Active_Policy_Strategies.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(PortableServer, - Active_Policy_Strategies, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/Adapter_Activator.cpp b/tao/PortableServer/Adapter_Activator.cpp index c05446d7a14..89202f2842c 100644 --- a/tao/PortableServer/Adapter_Activator.cpp +++ b/tao/PortableServer/Adapter_Activator.cpp @@ -2,10 +2,6 @@ #include "tao/PortableServer/Adapter_Activator.h" -ACE_RCSID (PortableServer, - Adapter_Activator, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) diff --git a/tao/PortableServer/Collocated_Arguments_Converter.cpp b/tao/PortableServer/Collocated_Arguments_Converter.cpp index 204b5d9868c..0032f3dddee 100644 --- a/tao/PortableServer/Collocated_Arguments_Converter.cpp +++ b/tao/PortableServer/Collocated_Arguments_Converter.cpp @@ -2,11 +2,6 @@ #include "tao/PortableServer/Collocated_Arguments_Converter.h" -ACE_RCSID(PortableServer, - TAO_Collocated_Arguments_Converter, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index bc946d33eb9..1dcb206274b 100644 --- a/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -11,10 +11,6 @@ #include "tao/ORB_Core.h" #include "tao/Profile.h" -ACE_RCSID (PortableServer, - Collocated_Object_Proxy_Broker, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/Creation_Time.cpp b/tao/PortableServer/Creation_Time.cpp index 0156db0dec3..65a764fcb0a 100644 --- a/tao/PortableServer/Creation_Time.cpp +++ b/tao/PortableServer/Creation_Time.cpp @@ -1,9 +1,5 @@ #include "tao/PortableServer/Creation_Time.h" -ACE_RCSID (PortableServer, - Creation_Time, - "$Id$") - #if !defined (__ACE_INLINE__) # include "tao/PortableServer/Creation_Time.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/tao/PortableServer/Default_Acceptor_Filter.cpp b/tao/PortableServer/Default_Acceptor_Filter.cpp index 40177f90b27..6bc2df993b4 100644 --- a/tao/PortableServer/Default_Acceptor_Filter.cpp +++ b/tao/PortableServer/Default_Acceptor_Filter.cpp @@ -5,11 +5,6 @@ #include "tao/MProfile.h" #include "tao/Profile.h" -ACE_RCSID(PortableServer, - Default_Acceptor_Filter, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void) diff --git a/tao/PortableServer/Default_Policy_Validator.cpp b/tao/PortableServer/Default_Policy_Validator.cpp index e66ba77840b..8e19fb20bcb 100644 --- a/tao/PortableServer/Default_Policy_Validator.cpp +++ b/tao/PortableServer/Default_Policy_Validator.cpp @@ -6,11 +6,6 @@ #include "tao/PolicyFactory_Registry_Adapter.h" #include "tao/PortableServer/PortableServer.h" -ACE_RCSID (PortableServer, - Default_Policy_Validator, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_POA_Default_Policy_Validator::TAO_POA_Default_Policy_Validator ( diff --git a/tao/PortableServer/Default_Servant_Dispatcher.cpp b/tao/PortableServer/Default_Servant_Dispatcher.cpp index 867ca5dcf33..64fcd20925f 100644 --- a/tao/PortableServer/Default_Servant_Dispatcher.cpp +++ b/tao/PortableServer/Default_Servant_Dispatcher.cpp @@ -4,10 +4,6 @@ #include "tao/PortableServer/Root_POA.h" #include "tao/PortableServer/Network_Priority_Hook.h" -ACE_RCSID(PortableServer, - Default_Servant_Dispatcher, - "$Id$") - #include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp index 184c4c28692..e9bdac8acb8 100644 --- a/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp +++ b/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp @@ -11,10 +11,6 @@ #include "tao/Object.h" #include "tao/SystemException.h" -ACE_RCSID (PortableServer, - Direct_Collocation_Upcall_Wrapper, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/tao/PortableServer/IdAssignmentPolicy.cpp b/tao/PortableServer/IdAssignmentPolicy.cpp index 5e5c697efe6..98c35ce5006 100644 --- a/tao/PortableServer/IdAssignmentPolicy.cpp +++ b/tao/PortableServer/IdAssignmentPolicy.cpp @@ -1,10 +1,6 @@ #include "tao/PortableServer/IdAssignmentPolicy.h" #include "tao/PortableServer/PortableServer.h" -ACE_RCSID (PortableServer, - IdAssignmentPolicy, - "$Id$") - #include "ace/CORBA_macros.h" #if !defined (CORBA_E_MICRO) diff --git a/tao/PortableServer/IdAssignmentStrategy.cpp b/tao/PortableServer/IdAssignmentStrategy.cpp index eb32db2161c..504f311821d 100644 --- a/tao/PortableServer/IdAssignmentStrategy.cpp +++ b/tao/PortableServer/IdAssignmentStrategy.cpp @@ -2,11 +2,6 @@ #include "tao/PortableServer/IdAssignmentStrategy.h" -ACE_RCSID (PortableServer, - IdAssignmentStrategy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp index 1a82a4df0e4..64125e36789 100644 --- a/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp +++ b/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp @@ -4,10 +4,6 @@ #include "tao/PortableServer/IdAssignmentStrategy.h" #include "ace/Dynamic_Service.h" -ACE_RCSID (PortableServer, - IdAssignmentStrategyFactoryImpl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/IdAssignmentStrategySystem.cpp b/tao/PortableServer/IdAssignmentStrategySystem.cpp index 11a9474effe..3313f5b0eb1 100644 --- a/tao/PortableServer/IdAssignmentStrategySystem.cpp +++ b/tao/PortableServer/IdAssignmentStrategySystem.cpp @@ -2,11 +2,6 @@ #include "tao/PortableServer/IdAssignmentStrategySystem.h" -ACE_RCSID (PortableServer, - Id_Assignment_Strategy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/IdAssignmentStrategyUser.cpp b/tao/PortableServer/IdAssignmentStrategyUser.cpp index f97260dc1b8..e30a3b897fe 100644 --- a/tao/PortableServer/IdAssignmentStrategyUser.cpp +++ b/tao/PortableServer/IdAssignmentStrategyUser.cpp @@ -2,10 +2,6 @@ #include "tao/PortableServer/IdAssignmentStrategyUser.h" -ACE_RCSID (PortableServer, - Id_Assignment_Strategy, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/IdUniquenessPolicy.cpp b/tao/PortableServer/IdUniquenessPolicy.cpp index f0096d44855..7c22b26aa49 100644 --- a/tao/PortableServer/IdUniquenessPolicy.cpp +++ b/tao/PortableServer/IdUniquenessPolicy.cpp @@ -1,10 +1,6 @@ #include "tao/PortableServer/IdUniquenessPolicy.h" #include "tao/PortableServer/PortableServer.h" -ACE_RCSID (PortableServer, - IdUniquenessPolicy, - "$Id$") - #include "ace/CORBA_macros.h" #if !defined (CORBA_E_MICRO) diff --git a/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp index ade09c36cd2..550b416663b 100644 --- a/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp +++ b/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp @@ -4,10 +4,6 @@ #include "tao/PortableServer/IdUniquenessStrategy.h" #include "ace/Dynamic_Service.h" -ACE_RCSID (PortableServer, - IdUniquenessStrategyFactoryImpl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/tao/PortableServer/IdUniquenessStrategyMultiple.cpp index d1e3920d8f9..c8de711be92 100644 --- a/tao/PortableServer/IdUniquenessStrategyMultiple.cpp +++ b/tao/PortableServer/IdUniquenessStrategyMultiple.cpp @@ -2,11 +2,6 @@ #include "tao/PortableServer/IdUniquenessStrategyMultiple.h" -ACE_RCSID (PortableServer, - Id_Uniqueness_Strategy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/tao/PortableServer/IdUniquenessStrategyUnique.cpp index f528cada72a..ef86863e04d 100644 --- a/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -3,11 +3,6 @@ #include "tao/PortableServer/IdUniquenessStrategyUnique.h" #include "tao/PortableServer/Root_POA.h" -ACE_RCSID (PortableServer, - Id_Uniqueness_Strategy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp index 3bb16166c08..cf426d70b8b 100644 --- a/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp +++ b/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp @@ -4,10 +4,6 @@ #include "tao/PortableServer/IdUniquenessStrategyUnique.h" #include "ace/Dynamic_Service.h" -ACE_RCSID (PortableServer, - IdUniquenessStrategyUniqueFactoryImpl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/ImR_Client_Adapter.cpp b/tao/PortableServer/ImR_Client_Adapter.cpp index c5a9d148f85..310cf51b8db 100644 --- a/tao/PortableServer/ImR_Client_Adapter.cpp +++ b/tao/PortableServer/ImR_Client_Adapter.cpp @@ -2,10 +2,6 @@ #include "tao/PortableServer/ImR_Client_Adapter.h" -ACE_RCSID (tao, - ImR_Client_Adapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/ImplicitActivationPolicy.cpp b/tao/PortableServer/ImplicitActivationPolicy.cpp index 6d3a91be8fb..31619683d77 100644 --- a/tao/PortableServer/ImplicitActivationPolicy.cpp +++ b/tao/PortableServer/ImplicitActivationPolicy.cpp @@ -1,10 +1,6 @@ #include "tao/PortableServer/ImplicitActivationPolicy.h" #include "tao/PortableServer/PortableServer.h" -ACE_RCSID (PortableServer, - ImplicitActivationPolicy, - "$Id$") - #include "ace/CORBA_macros.h" #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) diff --git a/tao/PortableServer/ImplicitActivationStrategy.cpp b/tao/PortableServer/ImplicitActivationStrategy.cpp index ad404a21c14..f06efb98479 100644 --- a/tao/PortableServer/ImplicitActivationStrategy.cpp +++ b/tao/PortableServer/ImplicitActivationStrategy.cpp @@ -2,10 +2,6 @@ #include "tao/PortableServer/ImplicitActivationStrategy.h" -ACE_RCSID (PortableServer, - ImplicitActivationStrategy, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp index 30ae08a7469..5761ec21f54 100644 --- a/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp +++ b/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp @@ -2,10 +2,6 @@ #include "tao/PortableServer/ImplicitActivationStrategyExplicit.h" -ACE_RCSID (PortableServer, - ImplicitActivationStrategyExplicit, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp index 9b113b1fafc..0a15d536afb 100644 --- a/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp +++ b/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp @@ -5,10 +5,6 @@ #include "tao/PortableServer/ImplicitActivationStrategyImplicit.h" #include "tao/PortableServer/ImplicitActivationStrategyExplicit.h" -ACE_RCSID (PortableServer, - ImplicitActivationStrategyFactoryImpl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp index 81878c8b94a..b7f7318e6c9 100644 --- a/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp +++ b/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp @@ -2,10 +2,6 @@ #include "tao/PortableServer/ImplicitActivationStrategyImplicit.h" -ACE_RCSID (PortableServer, - ImplicitActivationStrategyImplicit, - "$Id$") - #if !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/PortableServer/Key_Adapters.cpp b/tao/PortableServer/Key_Adapters.cpp index 01938ffe814..4ad3d4bfccc 100644 --- a/tao/PortableServer/Key_Adapters.cpp +++ b/tao/PortableServer/Key_Adapters.cpp @@ -6,10 +6,6 @@ #include "ace/OS_NS_string.h" #include "ace/Map_T.h" -ACE_RCSID (PortableServer, - Key_Adapters, - "$Id$") - /////////////////////////////////////////////////////////////////////////////// TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/PortableServer/LifespanPolicy.cpp b/tao/PortableServer/LifespanPolicy.cpp index d478bece27d..84f4041046b 100644 --- a/tao/PortableServer/LifespanPolicy.cpp +++ b/tao/PortableServer/LifespanPolicy.cpp @@ -1,10 +1,6 @@ #include "tao/PortableServer/LifespanPolicy.h" #include "tao/PortableServer/PortableServer.h" -ACE_RCSID (PortableServer, - LifespanPolicy, - "$Id$") - #include "ace/CORBA_macros.h" #if !defined (CORBA_E_MICRO) diff --git a/tao/PortableServer/LifespanStrategy.cpp b/tao/PortableServer/LifespanStrategy.cpp index 46ae7a9c870..976845cad88 100644 --- a/tao/PortableServer/LifespanStrategy.cpp +++ b/tao/PortableServer/LifespanStrategy.cpp @@ -11,10 +11,6 @@ #include "tao/PortableServer/LifespanStrategy.h" -ACE_RCSID (PortableServer, - LifespanStrategy, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/tao/PortableServer/LifespanStrategyFactoryImpl.cpp index 700cd5b6527..e859a50587f 100644 --- a/tao/PortableServer/LifespanStrategyFactoryImpl.cpp +++ b/tao/PortableServer/LifespanStrategyFactoryImpl.cpp @@ -4,10 +4,6 @@ #include "tao/PortableServer/LifespanStrategy.h" #include "ace/Dynamic_Service.h" -ACE_RCSID (PortableServer, - LifespanStrategyFactoryImpl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/LifespanStrategyPersistent.cpp b/tao/PortableServer/LifespanStrategyPersistent.cpp index 8f16ff49b3a..771245eb727 100644 --- a/tao/PortableServer/LifespanStrategyPersistent.cpp +++ b/tao/PortableServer/LifespanStrategyPersistent.cpp @@ -2,10 +2,6 @@ #include "tao/PortableServer/LifespanStrategyPersistent.h" -ACE_RCSID (PortableServer, - Lifespan_Strategy, - "$Id$") - #include "tao/PortableServer/Root_POA.h" #include "tao/PortableServer/POAManager.h" #include "tao/PortableServer/ImR_Client_Adapter.h" diff --git a/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp index 2e25ce5ae9e..1efe0b1674f 100644 --- a/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp +++ b/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp @@ -4,10 +4,6 @@ #include "ace/Dynamic_Service.h" #include "tao/PortableServer/LifespanStrategyPersistent.h" -ACE_RCSID (PortableServer, - LifespanStrategyFactoryImpl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/LifespanStrategyTransient.cpp b/tao/PortableServer/LifespanStrategyTransient.cpp index dd2fd1b5dfb..4b02af9e2ba 100644 --- a/tao/PortableServer/LifespanStrategyTransient.cpp +++ b/tao/PortableServer/LifespanStrategyTransient.cpp @@ -2,10 +2,6 @@ #include "tao/PortableServer/LifespanStrategyTransient.h" -ACE_RCSID (PortableServer, - Lifespan_Strategy, - "$Id$") - #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_string.h" #include "tao/PortableServer/POAManager.h" diff --git a/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp index ae8085a17bd..3cee3a56963 100644 --- a/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp +++ b/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp @@ -4,10 +4,6 @@ #include "ace/Dynamic_Service.h" #include "tao/PortableServer/LifespanStrategyTransient.h" -ACE_RCSID (PortableServer, - LifespanStrategyFactoryImpl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/Local_Servant_Base.cpp b/tao/PortableServer/Local_Servant_Base.cpp index 7ce7d293988..f63bb146c87 100644 --- a/tao/PortableServer/Local_Servant_Base.cpp +++ b/tao/PortableServer/Local_Servant_Base.cpp @@ -3,10 +3,6 @@ #include "tao/PortableServer/Local_Servant_Base.h" #include "tao/SystemException.h" -ACE_RCSID (PortableServer, - Local_Servant_Base, - "$Id$") - #if !defined (__ACE_INLINE__) # include "tao/PortableServer/Local_Servant_Base.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/tao/PortableServer/Network_Priority_Hook.cpp b/tao/PortableServer/Network_Priority_Hook.cpp index 6febf421bb4..2a72b0f4441 100644 --- a/tao/PortableServer/Network_Priority_Hook.cpp +++ b/tao/PortableServer/Network_Priority_Hook.cpp @@ -4,10 +4,6 @@ #include "tao/PortableServer/Root_POA.h" #include "tao/PortableServer/POA_Cached_Policies.h" -ACE_RCSID(PortableServer, - Network_Priority_Hook, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Network_Priority_Hook::~TAO_Network_Priority_Hook(void) diff --git a/tao/PortableServer/Non_Servant_Upcall.cpp b/tao/PortableServer/Non_Servant_Upcall.cpp index 6c3a108831f..1702524039e 100644 --- a/tao/PortableServer/Non_Servant_Upcall.cpp +++ b/tao/PortableServer/Non_Servant_Upcall.cpp @@ -8,10 +8,6 @@ # include "tao/PortableServer/Non_Servant_Upcall.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (PortableServer, - Non_Servant_Upcall, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/ORT_Adapter_Factory.cpp b/tao/PortableServer/ORT_Adapter_Factory.cpp index 7d4a85297b8..99d72a4ee81 100644 --- a/tao/PortableServer/ORT_Adapter_Factory.cpp +++ b/tao/PortableServer/ORT_Adapter_Factory.cpp @@ -2,10 +2,6 @@ #include "tao/PortableServer/ORT_Adapter_Factory.h" -ACE_RCSID (PortableServer, - ORT_Adapter_Factory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/Object_Adapter.cpp b/tao/PortableServer/Object_Adapter.cpp index 81c5cae34ea..d89a816b251 100644 --- a/tao/PortableServer/Object_Adapter.cpp +++ b/tao/PortableServer/Object_Adapter.cpp @@ -48,10 +48,6 @@ #include "tao/PortableServer/RequestProcessingPolicy.h" #include "tao/PortableServer/ServantRetentionPolicy.h" -ACE_RCSID (PortableServer, - Object_Adapter, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) namespace PortableServer { diff --git a/tao/PortableServer/Operation_Table.cpp b/tao/PortableServer/Operation_Table.cpp index bf8be18d80d..30494b02891 100644 --- a/tao/PortableServer/Operation_Table.cpp +++ b/tao/PortableServer/Operation_Table.cpp @@ -3,10 +3,6 @@ #include "tao/PortableServer/Operation_Table.h" #include "tao/ORB.h" -ACE_RCSID(PortableServer, - Operation_Table, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // destructor diff --git a/tao/PortableServer/Operation_Table_Binary_Search.cpp b/tao/PortableServer/Operation_Table_Binary_Search.cpp index 0df9e27630a..3d8b9872dcf 100644 --- a/tao/PortableServer/Operation_Table_Binary_Search.cpp +++ b/tao/PortableServer/Operation_Table_Binary_Search.cpp @@ -4,10 +4,6 @@ #include "tao/Timeprobe.h" #include "ace/Log_Msg.h" -ACE_RCSID(PortableServer, - Operation_Table_Binary_Search, - "$Id$") - #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_Operation_Table_Timeprobe_Description[] = diff --git a/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp index 21a206d9fba..eae26a71e4e 100644 --- a/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp +++ b/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp @@ -4,10 +4,6 @@ #include "tao/Timeprobe.h" #include "ace/Log_Msg.h" -ACE_RCSID(PortableServer, - Operation_Table_Dynamic_Hash, - "$Id$") - #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_Operation_Table_Timeprobe_Description[] = diff --git a/tao/PortableServer/Operation_Table_Linear_Search.cpp b/tao/PortableServer/Operation_Table_Linear_Search.cpp index 0ad27a2c2c8..95739497b67 100644 --- a/tao/PortableServer/Operation_Table_Linear_Search.cpp +++ b/tao/PortableServer/Operation_Table_Linear_Search.cpp @@ -4,10 +4,6 @@ #include "tao/Timeprobe.h" #include "ace/Log_Msg.h" -ACE_RCSID(PortableServer, - Operation_Table_Linear_Searc, - "$Id$") - #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_Operation_Table_Timeprobe_Description[] = diff --git a/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/tao/PortableServer/Operation_Table_Perfect_Hash.cpp index 25e30a1999e..da100f9802e 100644 --- a/tao/PortableServer/Operation_Table_Perfect_Hash.cpp +++ b/tao/PortableServer/Operation_Table_Perfect_Hash.cpp @@ -4,10 +4,6 @@ #include "tao/Timeprobe.h" #include "ace/Log_Msg.h" -ACE_RCSID(PortableServer, - Operation_Table_Perfect_Hash, - "$Id$") - #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_Operation_Table_Timeprobe_Description[] = diff --git a/tao/PortableServer/POAManager.cpp b/tao/PortableServer/POAManager.cpp index 02ab343da6e..2f408df551c 100644 --- a/tao/PortableServer/POAManager.cpp +++ b/tao/PortableServer/POAManager.cpp @@ -12,10 +12,6 @@ # include "tao/PortableServer/POAManager.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (PortableServer, - POAManager, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_POA_Manager::TAO_POA_Manager ( diff --git a/tao/PortableServer/POAManagerFactory.cpp b/tao/PortableServer/POAManagerFactory.cpp index 59a6100803e..3371ff79981 100644 --- a/tao/PortableServer/POAManagerFactory.cpp +++ b/tao/PortableServer/POAManagerFactory.cpp @@ -6,10 +6,6 @@ #include "ace/OS_NS_string.h" #include "ace/CORBA_macros.h" -ACE_RCSID (PortableServer, - POAManagerFactory, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/PortableServer/POA_Cached_Policies.cpp b/tao/PortableServer/POA_Cached_Policies.cpp index d531f09197f..9c2c871978c 100644 --- a/tao/PortableServer/POA_Cached_Policies.cpp +++ b/tao/PortableServer/POA_Cached_Policies.cpp @@ -14,10 +14,6 @@ # include "tao/PortableServer/POA_Cached_Policies.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID(PortableServer, - POA_Cached_Policies, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/POA_Current.cpp b/tao/PortableServer/POA_Current.cpp index 3ba22eb2f89..80c11743ac7 100644 --- a/tao/PortableServer/POA_Current.cpp +++ b/tao/PortableServer/POA_Current.cpp @@ -7,10 +7,6 @@ // -- TAO Include -- #include "tao/TSS_Resources.h" -ACE_RCSID (PortableServer, - POA_Current, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/POA_Current_Impl.cpp b/tao/PortableServer/POA_Current_Impl.cpp index 5350ae60e6c..74284aeef9d 100644 --- a/tao/PortableServer/POA_Current_Impl.cpp +++ b/tao/PortableServer/POA_Current_Impl.cpp @@ -11,10 +11,6 @@ # include "tao/PortableServer/POA_Current_Impl.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (PortableServer, - POA_Current_IMpl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/POA_Guard.cpp b/tao/PortableServer/POA_Guard.cpp index 17b976b6244..48137972315 100644 --- a/tao/PortableServer/POA_Guard.cpp +++ b/tao/PortableServer/POA_Guard.cpp @@ -4,11 +4,6 @@ #include "tao/PortableServer/Root_POA.h" #include "tao/ORB_Constants.h" -ACE_RCSID(PortableServer, - POA_Guard, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/POA_Policy_Set.cpp b/tao/PortableServer/POA_Policy_Set.cpp index b0eabe6df89..e0fba5f7d52 100644 --- a/tao/PortableServer/POA_Policy_Set.cpp +++ b/tao/PortableServer/POA_Policy_Set.cpp @@ -11,10 +11,6 @@ # include "tao/PortableServer/POA_Policy_Set.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (PortableServer, - POA_Policy_Set, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_POA_Policy_Set::TAO_POA_Policy_Set (void) diff --git a/tao/PortableServer/PortableServer.cpp b/tao/PortableServer/PortableServer.cpp index a5004ba3230..00f1d8f6d04 100644 --- a/tao/PortableServer/PortableServer.cpp +++ b/tao/PortableServer/PortableServer.cpp @@ -42,11 +42,6 @@ #include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h" #include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h" -ACE_RCSID (PortableServer, - PortableServer, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/tao/PortableServer/PortableServer_Functions.cpp b/tao/PortableServer/PortableServer_Functions.cpp index 4c0eb618345..6a54b693016 100644 --- a/tao/PortableServer/PortableServer_Functions.cpp +++ b/tao/PortableServer/PortableServer_Functions.cpp @@ -1,9 +1,5 @@ #include "tao/PortableServer/PortableServer_Functions.h" -ACE_RCSID (PortableServer, - PortableServer_Functions, - "$Id$") - #include "ace/OS_NS_string.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/PortableServer/PortableServer_WFunctions.cpp b/tao/PortableServer/PortableServer_WFunctions.cpp index 6bd25c45aaa..600a2493399 100644 --- a/tao/PortableServer/PortableServer_WFunctions.cpp +++ b/tao/PortableServer/PortableServer_WFunctions.cpp @@ -1,9 +1,5 @@ #include "tao/PortableServer/PortableServer_WFunctions.h" -ACE_RCSID (PortableServer, - PortableServer_WFunctions, - "$Id$") - #include "ace/OS_NS_string.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/PortableServer/Regular_POA.cpp b/tao/PortableServer/Regular_POA.cpp index ccee777e6a8..fad1bcc1272 100644 --- a/tao/PortableServer/Regular_POA.cpp +++ b/tao/PortableServer/Regular_POA.cpp @@ -1,9 +1,5 @@ #include "tao/PortableServer/Regular_POA.h" -ACE_RCSID (PortableServer, - POA, - "$Id$") - #if !defined (__ACE_INLINE__) # include "tao/PortableServer/Regular_POA.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/tao/PortableServer/RequestProcessingPolicy.cpp b/tao/PortableServer/RequestProcessingPolicy.cpp index 3a1f478abc6..f557e735e72 100644 --- a/tao/PortableServer/RequestProcessingPolicy.cpp +++ b/tao/PortableServer/RequestProcessingPolicy.cpp @@ -1,9 +1,5 @@ #include "tao/orbconf.h" -ACE_RCSID (PortableServer, - RequestProcessingPolicy, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/PortableServer/RequestProcessingPolicy.h" diff --git a/tao/PortableServer/RequestProcessingStrategy.cpp b/tao/PortableServer/RequestProcessingStrategy.cpp index 237449a1938..7e6e3ecb2fb 100644 --- a/tao/PortableServer/RequestProcessingStrategy.cpp +++ b/tao/PortableServer/RequestProcessingStrategy.cpp @@ -10,11 +10,6 @@ #include "tao/PortableServer/RequestProcessingStrategy.h" -ACE_RCSID (PortableServer, - RequestProcessingStrategy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp index 0921a84a439..4c428062cbb 100644 --- a/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp +++ b/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp @@ -7,10 +7,6 @@ #include "tao/PortableServer/Servant_Base.h" #include "tao/PortableServer/Root_POA.h" -ACE_RCSID (PortableServer, - Request_Processing, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp index bd1dbfcd0f4..90228a4eb56 100644 --- a/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp +++ b/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp @@ -6,10 +6,6 @@ #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" -ACE_RCSID (PortableServer, - RequestProcessingStrategyAOMOnlyFactoryImpl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index eb53b4f0297..eafb5f7c779 100644 --- a/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -2,10 +2,6 @@ #include "tao/orbconf.h" -ACE_RCSID (PortableServer, - Request_Processing, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/ORB_Constants.h" diff --git a/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp index 2d35f836d8f..42f778c5e21 100644 --- a/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp +++ b/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp @@ -2,10 +2,6 @@ #include "tao/orbconf.h" -ACE_RCSID (PortableServer, - RequestProcessingStrategyDefaultServantFI, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h" diff --git a/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp index 7b099039acd..dbaadb81a5d 100644 --- a/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp +++ b/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp @@ -8,10 +8,6 @@ #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" -ACE_RCSID (PortableServer, - RequestProcessingStrategyFactoryImpl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index 2729e7c0cc6..a9ba9d5033b 100644 --- a/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -1,10 +1,6 @@ // $Id$ #include "tao/orbconf.h" -ACE_RCSID (PortableServer, - Request_Processing, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/ORB_Constants.h" diff --git a/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp index 4afafb884be..89ade874fbc 100644 --- a/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp +++ b/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp @@ -2,10 +2,6 @@ #include "tao/orbconf.h" -ACE_RCSID (PortableServer, - RequestProcessingStrategyServantActivatorFactoryImpl, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h" diff --git a/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index f51ac0a48e4..c8bc26f2890 100644 --- a/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -1,9 +1,5 @@ #include "tao/orbconf.h" -ACE_RCSID (PortableServer, - Request_Processing, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/ORB_Constants.h" diff --git a/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp index e71553ede87..bcb5b81ae27 100644 --- a/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp +++ b/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp @@ -2,10 +2,6 @@ #include "tao/orbconf.h" -ACE_RCSID (PortableServer, - RequestProcessingStrategyServantLocatorFactoryImpl, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h" diff --git a/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/tao/PortableServer/RequestProcessingStrategyServantManager.cpp index f7d0822ab56..e81651cc5eb 100644 --- a/tao/PortableServer/RequestProcessingStrategyServantManager.cpp +++ b/tao/PortableServer/RequestProcessingStrategyServantManager.cpp @@ -2,10 +2,6 @@ #include "tao/orbconf.h" -ACE_RCSID (PortableServer, - Request_Processing, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/PortableServer/RequestProcessingStrategyServantManager.h" diff --git a/tao/PortableServer/Root_POA.cpp b/tao/PortableServer/Root_POA.cpp index ee41a71a580..1ad1cf676e5 100644 --- a/tao/PortableServer/Root_POA.cpp +++ b/tao/PortableServer/Root_POA.cpp @@ -61,10 +61,6 @@ # include "tao/PortableServer/Root_POA.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (PortableServer, - Root_POA, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // This is the TAO_Object_key-prefix that is appended to all TAO Object keys. diff --git a/tao/PortableServer/ServantRetentionPolicy.cpp b/tao/PortableServer/ServantRetentionPolicy.cpp index 5daea4a5819..a2a1d35cf0f 100644 --- a/tao/PortableServer/ServantRetentionPolicy.cpp +++ b/tao/PortableServer/ServantRetentionPolicy.cpp @@ -1,10 +1,6 @@ #include "tao/orbconf.h" -ACE_RCSID (PortableServer, - ServantRetentionPolicy, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/PortableServer/ServantRetentionPolicy.h" diff --git a/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp index be704740000..2d12888f667 100644 --- a/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp +++ b/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp @@ -6,10 +6,6 @@ #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" -ACE_RCSID (PortableServer, - ServantRetentionStrategyFactoryImpl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index 403199f6456..89fdaff1f71 100644 --- a/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -17,10 +17,6 @@ #include "tao/PortableServer/Servant_Base.h" #include "tao/debug.h" -ACE_RCSID (PortableServer, - ServantRetentionStrategyNonRetain, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp index 2fbf8cc8de9..e9284dd771b 100644 --- a/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp +++ b/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp @@ -2,10 +2,6 @@ #include "tao/orbconf.h" -ACE_RCSID (PortableServer, - ServantRetentionStrategyNonRetainFactoryImpl, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h" diff --git a/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/tao/PortableServer/ServantRetentionStrategyRetain.cpp index 20db848f97d..0286633d60f 100644 --- a/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -23,10 +23,6 @@ #include "ace/Monitor_Size.h" #endif /* TAO_HAS_MONITOR_POINTS */ -ACE_RCSID (PortableServer, - ServantRetentionStrategyRetain, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp index 18048bd07d2..799638826bc 100644 --- a/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp +++ b/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp @@ -6,10 +6,6 @@ #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" -ACE_RCSID (PortableServer, - ServantRetentionStrategyRetainFactoryImpl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/Servant_Base.cpp b/tao/PortableServer/Servant_Base.cpp index feca70b4c51..467a278347d 100644 --- a/tao/PortableServer/Servant_Base.cpp +++ b/tao/PortableServer/Servant_Base.cpp @@ -17,10 +17,6 @@ //@@ TAO_SERVANT_BASE_INCLUDE_ADD_HOOK -ACE_RCSID (PortableServer, - Servant_Base, - "$Id$") - #if !defined (__ACE_INLINE__) # include "tao/PortableServer/Servant_Base.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/tao/PortableServer/Servant_Dispatcher.cpp b/tao/PortableServer/Servant_Dispatcher.cpp index 05f34b15345..2ef0aec3052 100644 --- a/tao/PortableServer/Servant_Dispatcher.cpp +++ b/tao/PortableServer/Servant_Dispatcher.cpp @@ -2,11 +2,6 @@ #include "tao/PortableServer/Servant_Dispatcher.h" -ACE_RCSID(PortableServer, - Servant_Dispatcher, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher (void) diff --git a/tao/PortableServer/Servant_Upcall.cpp b/tao/PortableServer/Servant_Upcall.cpp index a8bde892350..c48fbe8f687 100644 --- a/tao/PortableServer/Servant_Upcall.cpp +++ b/tao/PortableServer/Servant_Upcall.cpp @@ -19,10 +19,6 @@ #include "ace/OS_NS_string.h" -ACE_RCSID (PortableServer, - Servant_Upcall, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/StrategyFactory.cpp b/tao/PortableServer/StrategyFactory.cpp index 58a4bc04c11..31b2c286ae9 100644 --- a/tao/PortableServer/StrategyFactory.cpp +++ b/tao/PortableServer/StrategyFactory.cpp @@ -3,10 +3,6 @@ #include "tao/PortableServer/StrategyFactory.h" #include "ace/Dynamic_Service.h" -ACE_RCSID (PortableServer, - StrategyFactory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/ThreadPolicy.cpp b/tao/PortableServer/ThreadPolicy.cpp index 57b630bc0f3..254e4b89ca5 100644 --- a/tao/PortableServer/ThreadPolicy.cpp +++ b/tao/PortableServer/ThreadPolicy.cpp @@ -1,9 +1,5 @@ #include "tao/orbconf.h" -ACE_RCSID (PortableServer, - ThreadPolicy, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/PortableServer/ThreadPolicy.h" diff --git a/tao/PortableServer/ThreadStrategy.cpp b/tao/PortableServer/ThreadStrategy.cpp index 900d238a905..085784f481a 100644 --- a/tao/PortableServer/ThreadStrategy.cpp +++ b/tao/PortableServer/ThreadStrategy.cpp @@ -2,10 +2,6 @@ #include "tao/PortableServer/ThreadStrategy.h" -ACE_RCSID (PortableServer, - ThreadStrategy, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/tao/PortableServer/ThreadStrategyFactoryImpl.cpp index 4667bf58395..b9fe653988b 100644 --- a/tao/PortableServer/ThreadStrategyFactoryImpl.cpp +++ b/tao/PortableServer/ThreadStrategyFactoryImpl.cpp @@ -5,10 +5,6 @@ #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" -ACE_RCSID (PortableServer, - ThreadStrategyFactoryImpl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/ThreadStrategyORBControl.cpp b/tao/PortableServer/ThreadStrategyORBControl.cpp index e5c2e6b47a9..d64e82f35dd 100644 --- a/tao/PortableServer/ThreadStrategyORBControl.cpp +++ b/tao/PortableServer/ThreadStrategyORBControl.cpp @@ -3,10 +3,6 @@ #include "tao/PortableServer/ThreadStrategyORBControl.h" #include "ace/Log_Msg.h" -ACE_RCSID (PortableServer, - ThreadStrategyORBControl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/PortableServer/ThreadStrategySingle.cpp b/tao/PortableServer/ThreadStrategySingle.cpp index 166aaf1cec4..040a2ad69d9 100644 --- a/tao/PortableServer/ThreadStrategySingle.cpp +++ b/tao/PortableServer/ThreadStrategySingle.cpp @@ -2,10 +2,6 @@ #include "tao/orbconf.h" -ACE_RCSID (PortableServer, - ThreadStrategySingle, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/PortableServer/ThreadStrategySingle.h" diff --git a/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp index bcccac2035f..8967b90a273 100644 --- a/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp +++ b/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp @@ -2,10 +2,6 @@ #include "tao/orbconf.h" -ACE_RCSID (PortableServer, - ThreadStrategyFactoryImpl, - "$Id$") - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h" diff --git a/tao/PortableServer/Upcall_Command.cpp b/tao/PortableServer/Upcall_Command.cpp index f45184d950e..050d1853f5e 100644 --- a/tao/PortableServer/Upcall_Command.cpp +++ b/tao/PortableServer/Upcall_Command.cpp @@ -2,11 +2,6 @@ #include "tao/PortableServer/Upcall_Command.h" -ACE_RCSID (PortableServer, - Upcall_Command, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Upcall_Command::~Upcall_Command (void) diff --git a/tao/PortableServer/Upcall_Wrapper.cpp b/tao/PortableServer/Upcall_Wrapper.cpp index cdf37af7b09..f3dad5e121c 100644 --- a/tao/PortableServer/Upcall_Wrapper.cpp +++ b/tao/PortableServer/Upcall_Wrapper.cpp @@ -20,10 +20,6 @@ #include "ace/Log_Msg.h" #include "tao/debug.h" -ACE_RCSID (PortableServer, - Upcall_Wrapper, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/tao/Profile.cpp b/tao/Profile.cpp index a29999ed6ef..a61391d569e 100644 --- a/tao/Profile.cpp +++ b/tao/Profile.cpp @@ -21,11 +21,6 @@ #include "tao/Profile.inl" #endif /* __ACE_INLINE__ */ - -ACE_RCSID (tao, - Profile, - "$Id$") - // **************************************************************** TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/Profile_Transport_Resolver.cpp b/tao/Profile_Transport_Resolver.cpp index 6f7ad056e4c..15ce4ccd8d8 100644 --- a/tao/Profile_Transport_Resolver.cpp +++ b/tao/Profile_Transport_Resolver.cpp @@ -24,11 +24,6 @@ # include "tao/Profile_Transport_Resolver.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Profile_Transport_Resolver, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/Protocol_Factory.cpp b/tao/Protocol_Factory.cpp index e72f2563a8f..8b3b879ccf1 100644 --- a/tao/Protocol_Factory.cpp +++ b/tao/Protocol_Factory.cpp @@ -2,10 +2,6 @@ #include "tao/Protocol_Factory.h" -ACE_RCSID (tao, - Protocol_Factory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Protocol_Factory::TAO_Protocol_Factory (CORBA::ULong tag) diff --git a/tao/Protocols_Hooks.cpp b/tao/Protocols_Hooks.cpp index 884c613ea41..257588d025c 100644 --- a/tao/Protocols_Hooks.cpp +++ b/tao/Protocols_Hooks.cpp @@ -3,10 +3,6 @@ #include "tao/Protocols_Hooks.h" #include "ace/Dynamic_Service.h" -ACE_RCSID (tao, - Protocols_Hooks, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IIOP_Protocol_Properties::TAO_IIOP_Protocol_Properties (void) diff --git a/tao/QtResource.mpc b/tao/QtResource.mpc index 639208dd94d..230d7263787 100644 --- a/tao/QtResource.mpc +++ b/tao/QtResource.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- now wouldn't this be cool... // $Id$ -project(TAO_QtResource) : acelib, taolib, install, tao_output, taodefaults, ace_qtreactor, taoidldefaults { +project(TAO_QtResource) : acelib, taolib, install, tao_output, taodefaults, ace_qt4reactor, taoidldefaults { sharedname = TAO_QtResource dynamicflags += TAO_QTRESOURCE_BUILD_DLL diff --git a/tao/Queued_Data.cpp b/tao/Queued_Data.cpp index 64b5210401e..e4a827a6305 100644 --- a/tao/Queued_Data.cpp +++ b/tao/Queued_Data.cpp @@ -8,10 +8,6 @@ # include "tao/Queued_Data.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Queued_Data, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /*! diff --git a/tao/Queued_Message.cpp b/tao/Queued_Message.cpp index 1f83185fa98..ce559374f08 100644 --- a/tao/Queued_Message.cpp +++ b/tao/Queued_Message.cpp @@ -6,10 +6,6 @@ # include "tao/Queued_Message.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Queued_Message, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Queued_Message::TAO_Queued_Message (TAO_ORB_Core *oc, diff --git a/tao/Reactive_Connect_Strategy.cpp b/tao/Reactive_Connect_Strategy.cpp index fec22b526d0..c5bcbe3c6b2 100644 --- a/tao/Reactive_Connect_Strategy.cpp +++ b/tao/Reactive_Connect_Strategy.cpp @@ -7,11 +7,6 @@ #include "ace/Synch_Options.h" -ACE_RCSID(tao, - Reactive_Connect_Strategy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Reactive_Connect_Strategy::TAO_Reactive_Connect_Strategy ( diff --git a/tao/Reactive_Flushing_Strategy.cpp b/tao/Reactive_Flushing_Strategy.cpp index 4d0e7ff8078..9f1ba2e5817 100644 --- a/tao/Reactive_Flushing_Strategy.cpp +++ b/tao/Reactive_Flushing_Strategy.cpp @@ -6,11 +6,6 @@ #include "tao/ORB_Core.h" #include "tao/Queued_Message.h" -ACE_RCSID (tao, - Reactive_Flushing_Strategy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/tao/Refcounted_ObjectKey.cpp b/tao/Refcounted_ObjectKey.cpp index 074a9e3d6ed..c226cd4c769 100644 --- a/tao/Refcounted_ObjectKey.cpp +++ b/tao/Refcounted_ObjectKey.cpp @@ -6,11 +6,6 @@ #include "tao/Refcounted_ObjectKey.inl" #endif /* defined INLINE */ -ACE_RCSID(tao, - Refcounted_ObjectKey, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Refcounted_ObjectKey::Refcounted_ObjectKey (const TAO::ObjectKey &key) diff --git a/tao/Remote_Invocation.cpp b/tao/Remote_Invocation.cpp index 4214cc510a2..c18604038d6 100644 --- a/tao/Remote_Invocation.cpp +++ b/tao/Remote_Invocation.cpp @@ -12,10 +12,6 @@ #include "tao/debug.h" #include "tao/SystemException.h" -ACE_RCSID (tao, - Remote_Invocation, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/Remote_Object_Proxy_Broker.cpp b/tao/Remote_Object_Proxy_Broker.cpp index e1a48b7f411..77ef8c422f7 100644 --- a/tao/Remote_Object_Proxy_Broker.cpp +++ b/tao/Remote_Object_Proxy_Broker.cpp @@ -9,11 +9,6 @@ #include "ace/Dynamic_Service.h" -ACE_RCSID (tao, - Remote_Object_Proxy_Broker, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/Reply_Dispatcher.cpp b/tao/Reply_Dispatcher.cpp index e69fec458e2..700d3f5c8e7 100644 --- a/tao/Reply_Dispatcher.cpp +++ b/tao/Reply_Dispatcher.cpp @@ -2,10 +2,6 @@ #include "tao/Reply_Dispatcher.h" -ACE_RCSID (tao, - Reply_Dispatcher, - "$Id$") - #if !defined (__ACE_INLINE__) #include "tao/Reply_Dispatcher.inl" #endif /* __ACE_INLINE__ */ diff --git a/tao/RequestInterceptor_Adapter.cpp b/tao/RequestInterceptor_Adapter.cpp index c0657ad21cd..c5d14708881 100644 --- a/tao/RequestInterceptor_Adapter.cpp +++ b/tao/RequestInterceptor_Adapter.cpp @@ -13,10 +13,6 @@ #include "tao/RequestInterceptor_Adapter.h" -ACE_RCSID (tao, - RequestInterceptor_Adapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::RequestInterceptor_Adapter::~RequestInterceptor_Adapter (void) diff --git a/tao/Request_Dispatcher.cpp b/tao/Request_Dispatcher.cpp index dd44d1338f9..eed80b6d415 100644 --- a/tao/Request_Dispatcher.cpp +++ b/tao/Request_Dispatcher.cpp @@ -4,10 +4,6 @@ #include "tao/TAO_Server_Request.h" #include "tao/ORB_Core.h" -ACE_RCSID (tao, - Request_Dispatcher, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Request_Dispatcher::~TAO_Request_Dispatcher (void) diff --git a/tao/Resource_Factory.cpp b/tao/Resource_Factory.cpp index 8ecee46a4c4..103b78825af 100644 --- a/tao/Resource_Factory.cpp +++ b/tao/Resource_Factory.cpp @@ -6,11 +6,6 @@ #include "ace/ACE.h" -ACE_RCSID (tao, - Resource_Factory, - "$Id$") - - // **************************************************************** TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/Resume_Handle.cpp b/tao/Resume_Handle.cpp index 6ce7297a70f..5b6915f5fc4 100644 --- a/tao/Resume_Handle.cpp +++ b/tao/Resume_Handle.cpp @@ -8,11 +8,6 @@ # include "tao/Resume_Handle.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Resume_Handle, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/tao/ServerRequestInterceptor_Adapter.cpp b/tao/ServerRequestInterceptor_Adapter.cpp index 7afe711cb85..ff032bbdb59 100644 --- a/tao/ServerRequestInterceptor_Adapter.cpp +++ b/tao/ServerRequestInterceptor_Adapter.cpp @@ -1,9 +1,5 @@ #include "tao/ServerRequestInterceptor_Adapter.h" -ACE_RCSID (tao, - ServerRequestInterceptorAdapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::ServerRequestInterceptor_Adapter::~ServerRequestInterceptor_Adapter (void) diff --git a/tao/ServerRequestInterceptor_Adapter_Factory.cpp b/tao/ServerRequestInterceptor_Adapter_Factory.cpp index 3408f8b97aa..8847b4c82a3 100644 --- a/tao/ServerRequestInterceptor_Adapter_Factory.cpp +++ b/tao/ServerRequestInterceptor_Adapter_Factory.cpp @@ -1,10 +1,5 @@ #include "tao/ServerRequestInterceptor_Adapter_Factory.h" -ACE_RCSID (tao, - ServerRequestInterceptorAdapterFactory, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ServerRequestInterceptor_Adapter_Factory::~TAO_ServerRequestInterceptor_Adapter_Factory (void) diff --git a/tao/Server_Strategy_Factory.cpp b/tao/Server_Strategy_Factory.cpp index 7b8c1f300c4..079b96605db 100644 --- a/tao/Server_Strategy_Factory.cpp +++ b/tao/Server_Strategy_Factory.cpp @@ -3,11 +3,6 @@ #include "tao/Server_Strategy_Factory.h" #include "tao/orbconf.h" -ACE_RCSID (tao, - Server_Strategy_Factory, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Server_Strategy_Factory::TAO_Server_Strategy_Factory (void) diff --git a/tao/Service_Callbacks.cpp b/tao/Service_Callbacks.cpp index 30546a5b5ac..c0e3d4a7991 100644 --- a/tao/Service_Callbacks.cpp +++ b/tao/Service_Callbacks.cpp @@ -3,11 +3,6 @@ #include "tao/SystemException.h" #include "tao/Invocation_Utils.h" -ACE_RCSID (tao, - Service_Callbacks, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Service_Callbacks::~TAO_Service_Callbacks (void) diff --git a/tao/Service_Context.cpp b/tao/Service_Context.cpp index dc8f96bc545..a766a132b8c 100644 --- a/tao/Service_Context.cpp +++ b/tao/Service_Context.cpp @@ -9,11 +9,6 @@ #include "ace/OS_NS_string.h" -ACE_RCSID (tao, - Service_Context, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/tao/Service_Context_Handler.cpp b/tao/Service_Context_Handler.cpp index 90e30d2c306..3ad1f06af10 100644 --- a/tao/Service_Context_Handler.cpp +++ b/tao/Service_Context_Handler.cpp @@ -2,10 +2,6 @@ #include "tao/Service_Context_Handler.h" -ACE_RCSID (tao, - Service_Context_Handler, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Service_Context_Handler::TAO_Service_Context_Handler (void) diff --git a/tao/Service_Context_Handler_Registry.cpp b/tao/Service_Context_Handler_Registry.cpp index 83d90497249..fe18a5084f8 100644 --- a/tao/Service_Context_Handler_Registry.cpp +++ b/tao/Service_Context_Handler_Registry.cpp @@ -2,10 +2,6 @@ #include "tao/Service_Context_Handler_Registry.h" -ACE_RCSID (tao, - Service_Context_Handler_Registry, - "$Id$") - #include "tao/TAO_Server_Request.h" #include "tao/Service_Context_Handler.h" diff --git a/tao/Services_Activate.cpp b/tao/Services_Activate.cpp index 22944bd9430..23ee61121bb 100644 --- a/tao/Services_Activate.cpp +++ b/tao/Services_Activate.cpp @@ -1,9 +1,5 @@ #include "tao/Services_Activate.h" -ACE_RCSID (tao, - Services_Activate, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Services_Activate::~TAO_Services_Activate (void) diff --git a/tao/String_Alloc.cpp b/tao/String_Alloc.cpp index fbf074ec369..25817ce889d 100644 --- a/tao/String_Alloc.cpp +++ b/tao/String_Alloc.cpp @@ -7,10 +7,6 @@ // FUZZ: disable check_for_streams_include #include "ace/streams.h" -ACE_RCSID (tao, - String_Alloc, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL char * diff --git a/tao/Stub.cpp b/tao/Stub.cpp index 778baf188bc..94095ac0cbe 100644 --- a/tao/Stub.cpp +++ b/tao/Stub.cpp @@ -27,10 +27,6 @@ #include "ace/Auto_Ptr.h" #include "ace/CORBA_macros.h" -ACE_RCSID (tao, - TAO_Stub, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Stub::TAO_Stub (const char *repository_id, diff --git a/tao/Stub_Factory.cpp b/tao/Stub_Factory.cpp index 4c76edc15c9..1a5ff920cb9 100644 --- a/tao/Stub_Factory.cpp +++ b/tao/Stub_Factory.cpp @@ -2,10 +2,6 @@ #include "tao/Stub_Factory.h" -ACE_RCSID (tao, - TAO_Stub_Factory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Stub_Factory::~TAO_Stub_Factory (void) diff --git a/tao/Synch_Invocation.cpp b/tao/Synch_Invocation.cpp index 7e3009faa5e..9d6b1f22721 100644 --- a/tao/Synch_Invocation.cpp +++ b/tao/Synch_Invocation.cpp @@ -29,12 +29,6 @@ # include "tao/Synch_Invocation.inl" #endif /* __ACE_INLINE__ */ - -ACE_RCSID (tao, - Synch_Invocation, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/Synch_Queued_Message.cpp b/tao/Synch_Queued_Message.cpp index 84677dd1d16..7cae04d7a61 100644 --- a/tao/Synch_Queued_Message.cpp +++ b/tao/Synch_Queued_Message.cpp @@ -7,10 +7,6 @@ #include "ace/Malloc_T.h" #include "ace/Message_Block.h" -ACE_RCSID (tao, - Synch_Queued_Message, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Synch_Queued_Message::TAO_Synch_Queued_Message ( diff --git a/tao/Synch_Reply_Dispatcher.cpp b/tao/Synch_Reply_Dispatcher.cpp index a69467ed500..6bdea83aae1 100644 --- a/tao/Synch_Reply_Dispatcher.cpp +++ b/tao/Synch_Reply_Dispatcher.cpp @@ -5,11 +5,6 @@ #include "tao/Pluggable_Messaging_Utils.h" #include "tao/debug.h" - -ACE_RCSID (tao, - Synch_Reply_Dispatcher, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Constructor. diff --git a/tao/SystemException.cpp b/tao/SystemException.cpp index 48f276b0541..cbd8b77202a 100644 --- a/tao/SystemException.cpp +++ b/tao/SystemException.cpp @@ -23,12 +23,6 @@ # include "tao/SystemException.inl" #endif /* __ACE_INLINE__ */ - -ACE_RCSID (tao, - SystemException, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/tao/TAO_Internal.cpp b/tao/TAO_Internal.cpp index 5d39857ddbc..2283eb1a270 100644 --- a/tao/TAO_Internal.cpp +++ b/tao/TAO_Internal.cpp @@ -32,10 +32,6 @@ #include "ace/Static_Object_Lock.h" #include "ace/OS_NS_sys_stat.h" -ACE_RCSID (tao, - TAO_Internal, - "$Id$") - #ifndef TAO_DEFAULT_RESOURCE_FACTORY_ARGS # define TAO_DEFAULT_RESOURCE_FACTORY_ARGS 0 #endif /* !TAO_DEFAULT_RESOURCE_FACTORY_ARGS */ diff --git a/tao/TAO_Server_Request.cpp b/tao/TAO_Server_Request.cpp index 3afd77b071c..8c72e760807 100644 --- a/tao/TAO_Server_Request.cpp +++ b/tao/TAO_Server_Request.cpp @@ -21,10 +21,6 @@ # include "tao/TAO_Server_Request.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - TAO_Server_Request, - "$Id$") - #if defined (ACE_ENABLE_TIMEPROBES) static const char * TAO_Server_Request_Timeprobe_Description[] = diff --git a/tao/TAO_Singleton_Manager.cpp b/tao/TAO_Singleton_Manager.cpp index 256ce2339e9..88a1d7d7114 100644 --- a/tao/TAO_Singleton_Manager.cpp +++ b/tao/TAO_Singleton_Manager.cpp @@ -12,10 +12,6 @@ # include "tao/TAO_Singleton_Manager.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - TAO_Singleton_Manager, - "$Id$") - namespace { // Singleton instance pointer. diff --git a/tao/TSS_Resources.cpp b/tao/TSS_Resources.cpp index dea17e382d5..a7a88bf1b08 100644 --- a/tao/TSS_Resources.cpp +++ b/tao/TSS_Resources.cpp @@ -4,11 +4,6 @@ #include "tao/GUIResource_Factory.h" #include "tao/TAO_Singleton.h" -ACE_RCSID (tao, - TSS_Resources, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_TSS_Resources::TAO_TSS_Resources (void) diff --git a/tao/Tagged_Components.cpp b/tao/Tagged_Components.cpp index e29499484da..40ffcc60d02 100644 --- a/tao/Tagged_Components.cpp +++ b/tao/Tagged_Components.cpp @@ -9,11 +9,6 @@ #include "ace/OS_NS_string.h" -ACE_RCSID (tao, - Tagged_Components, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/tao/Tagged_Profile.cpp b/tao/Tagged_Profile.cpp index 627c4297237..81d0006d65c 100644 --- a/tao/Tagged_Profile.cpp +++ b/tao/Tagged_Profile.cpp @@ -13,10 +13,6 @@ # include "tao/Tagged_Profile.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - Tagged_Profile, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean diff --git a/tao/Thread_Lane_Resources.cpp b/tao/Thread_Lane_Resources.cpp index 083e90c39ae..8c0da1f6e1d 100644 --- a/tao/Thread_Lane_Resources.cpp +++ b/tao/Thread_Lane_Resources.cpp @@ -2,10 +2,6 @@ #include "tao/Thread_Lane_Resources.h" -ACE_RCSID (tao, - Thread_Lane_Resources, - "$Id$") - #include "tao/Acceptor_Registry.h" #include "tao/LF_Follower.h" #include "tao/Leader_Follower.h" diff --git a/tao/Thread_Lane_Resources_Manager.cpp b/tao/Thread_Lane_Resources_Manager.cpp index 8a3465d2648..545bd93ca4f 100644 --- a/tao/Thread_Lane_Resources_Manager.cpp +++ b/tao/Thread_Lane_Resources_Manager.cpp @@ -6,10 +6,6 @@ #include "ace/Dynamic_Service.h" -ACE_RCSID (tao, - Thread_Lane_Resources_Manager, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Thread_Lane_Resources_Manager::TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core) diff --git a/tao/Thread_Per_Connection_Handler.cpp b/tao/Thread_Per_Connection_Handler.cpp index 884b7eff152..342018d9b08 100644 --- a/tao/Thread_Per_Connection_Handler.cpp +++ b/tao/Thread_Per_Connection_Handler.cpp @@ -6,10 +6,6 @@ #include "tao/ORB_Core.h" #include "ace/Flag_Manip.h" -ACE_RCSID (tao, - Thread_Per_Connection_Handler, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Thread_Per_Connection_Handler::TAO_Thread_Per_Connection_Handler ( diff --git a/tao/Transport.cpp b/tao/Transport.cpp index 3fe918c3a02..ecf3d86e9ad 100644 --- a/tao/Transport.cpp +++ b/tao/Transport.cpp @@ -44,11 +44,6 @@ # include "tao/Transport.inl" #endif /* __ACE_INLINE__ */ - -ACE_RCSID (tao, - Transport, - "$Id$") - /* * Static function in file scope */ diff --git a/tao/Transport_Acceptor.cpp b/tao/Transport_Acceptor.cpp index 14626a5a3cd..20a7f749040 100644 --- a/tao/Transport_Acceptor.cpp +++ b/tao/Transport_Acceptor.cpp @@ -8,11 +8,6 @@ # include "tao/Transport_Acceptor.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Acceptor, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Acceptor::TAO_Acceptor (CORBA::ULong tag) diff --git a/tao/Transport_Cache_Manager_T.cpp b/tao/Transport_Cache_Manager_T.cpp index c3aae748918..2e49d7e1399 100644 --- a/tao/Transport_Cache_Manager_T.cpp +++ b/tao/Transport_Cache_Manager_T.cpp @@ -13,10 +13,6 @@ # include "tao/Transport_Cache_Manager_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Transport_Cache_Manager_T, - "$Id$") - // notes on debug level and LM_xxxx codes for transport cache // TAO_debug_level > 0: recoverable error condition (LM_ERROR) // TAO_debug_level > 4: normal transport cache operations (LM_INFO) diff --git a/tao/Transport_Connector.cpp b/tao/Transport_Connector.cpp index 3c5c3ba7b9a..f71504ba0b7 100644 --- a/tao/Transport_Connector.cpp +++ b/tao/Transport_Connector.cpp @@ -23,10 +23,6 @@ # include "tao/Transport_Connector.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Connector, - "$Id$") - namespace { class TransportCleanupGuard diff --git a/tao/Transport_Descriptor_Interface.cpp b/tao/Transport_Descriptor_Interface.cpp index f6c23268dc0..fe038e33c63 100644 --- a/tao/Transport_Descriptor_Interface.cpp +++ b/tao/Transport_Descriptor_Interface.cpp @@ -6,11 +6,6 @@ #include "tao/Endpoint.h" -ACE_RCSID (tao, - Transport_Descriptor_Interface, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Transport_Descriptor_Interface::~TAO_Transport_Descriptor_Interface (void) diff --git a/tao/Transport_Mux_Strategy.cpp b/tao/Transport_Mux_Strategy.cpp index 196d7e6338c..cbefdeed656 100644 --- a/tao/Transport_Mux_Strategy.cpp +++ b/tao/Transport_Mux_Strategy.cpp @@ -2,11 +2,6 @@ #include "tao/Transport_Mux_Strategy.h" -ACE_RCSID (tao, - Transport_Mux_Strategy, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy ( diff --git a/tao/Transport_Queueing_Strategies.cpp b/tao/Transport_Queueing_Strategies.cpp index 8ff8ab416b6..eae686dc161 100644 --- a/tao/Transport_Queueing_Strategies.cpp +++ b/tao/Transport_Queueing_Strategies.cpp @@ -7,11 +7,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_sys_time.h" -ACE_RCSID (tao, - Transport_Queueing_Strategies, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/Transport_Selection_Guard.cpp b/tao/Transport_Selection_Guard.cpp index 3f0c86d0928..6af7a75ac9b 100644 --- a/tao/Transport_Selection_Guard.cpp +++ b/tao/Transport_Selection_Guard.cpp @@ -3,10 +3,6 @@ #include "tao/Transport_Selection_Guard.h" #include "tao/TSS_Resources.h" -ACE_RCSID (tao, - Transport_Selection_Guard, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tao/Transport_Timer.cpp b/tao/Transport_Timer.cpp index 6a704fbd72f..d92c07ee68f 100644 --- a/tao/Transport_Timer.cpp +++ b/tao/Transport_Timer.cpp @@ -3,10 +3,6 @@ #include "tao/Transport_Timer.h" #include "tao/Transport.h" -ACE_RCSID (tao, - Transport_Timer, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Transport_Timer::TAO_Transport_Timer (TAO_Transport *transport) diff --git a/tao/TypeCodeFactory_Adapter.cpp b/tao/TypeCodeFactory_Adapter.cpp index 1dbec9f2dea..354ffcc9308 100644 --- a/tao/TypeCodeFactory_Adapter.cpp +++ b/tao/TypeCodeFactory_Adapter.cpp @@ -4,10 +4,6 @@ #include "ace/Dynamic_Service.h" -ACE_RCSID (tao, - TypeCodeFactory_Adapter, - "$Id$") - TAO_TypeCodeFactory_Adapter::~TAO_TypeCodeFactory_Adapter (void) { } diff --git a/tao/UserException.cpp b/tao/UserException.cpp index 638f895b362..bfb82367587 100644 --- a/tao/UserException.cpp +++ b/tao/UserException.cpp @@ -9,11 +9,6 @@ # include "tao/UserException.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - UserException, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Virtual. Do not inline. diff --git a/tao/Valuetype_Adapter.cpp b/tao/Valuetype_Adapter.cpp index 42cf8207876..6ee56035c49 100644 --- a/tao/Valuetype_Adapter.cpp +++ b/tao/Valuetype_Adapter.cpp @@ -2,10 +2,6 @@ #include "tao/Valuetype_Adapter.h" -ACE_RCSID (tao, - Valuetype_Adapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Valuetype_Adapter::~TAO_Valuetype_Adapter (void) diff --git a/tao/Valuetype_Adapter_Factory.cpp b/tao/Valuetype_Adapter_Factory.cpp index 5cee721f6af..dffbe20ca95 100644 --- a/tao/Valuetype_Adapter_Factory.cpp +++ b/tao/Valuetype_Adapter_Factory.cpp @@ -1,10 +1,6 @@ // $Id$ #include "tao/Valuetype_Adapter_Factory.h" -ACE_RCSID (tao, - Valuetype_Adapter_Factory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Valuetype_Adapter_Factory::~TAO_Valuetype_Adapter_Factory (void) diff --git a/tao/Wait_On_LF_No_Upcall.cpp b/tao/Wait_On_LF_No_Upcall.cpp index 4d9c205610b..f97d32ae5ae 100644 --- a/tao/Wait_On_LF_No_Upcall.cpp +++ b/tao/Wait_On_LF_No_Upcall.cpp @@ -7,10 +7,6 @@ #include "tao/ORB_Core_TSS_Resources.h" #include "tao/debug.h" -ACE_RCSID(tao, - Wait_On_LF_No_Upcall, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Transport; diff --git a/tao/Wait_On_Leader_Follower.cpp b/tao/Wait_On_Leader_Follower.cpp index c9afa361710..75c8282e18a 100644 --- a/tao/Wait_On_Leader_Follower.cpp +++ b/tao/Wait_On_Leader_Follower.cpp @@ -7,10 +7,6 @@ #include "tao/Synch_Reply_Dispatcher.h" #include "tao/ORB_Core.h" -ACE_RCSID (tao, - Wait_On_Leader_Follower, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower diff --git a/tao/Wait_On_Reactor.cpp b/tao/Wait_On_Reactor.cpp index 768bf83ce3f..2cc6c83ffe4 100644 --- a/tao/Wait_On_Reactor.cpp +++ b/tao/Wait_On_Reactor.cpp @@ -8,10 +8,6 @@ #include "ace/Reactor.h" #include "ace/Countdown_Time.h" -ACE_RCSID (tao, - Wait_On_Reactor, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Wait_On_Reactor::TAO_Wait_On_Reactor (TAO_Transport *transport) diff --git a/tao/Wait_On_Read.cpp b/tao/Wait_On_Read.cpp index 3e3366136bb..d38d0232a81 100644 --- a/tao/Wait_On_Read.cpp +++ b/tao/Wait_On_Read.cpp @@ -9,10 +9,6 @@ #include "ace/Reactor.h" #include "ace/Countdown_Time.h" -ACE_RCSID (tao, - Wait_On_Read, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Constructor. diff --git a/tao/Wait_Strategy.cpp b/tao/Wait_Strategy.cpp index a0f49b621ff..c310221b7ad 100644 --- a/tao/Wait_Strategy.cpp +++ b/tao/Wait_Strategy.cpp @@ -4,10 +4,6 @@ //@@ WAIT_STRATEGY_SPL_COPY_HOOK_START -ACE_RCSID (tao, - Wait_Strategy, - "$Id$") - #if !defined (__ACE_INLINE__) # include "tao/Wait_Strategy.inl" #endif /* __ACE_INLINE__ */ diff --git a/tao/debug.cpp b/tao/debug.cpp index 39c3b7ff14f..7b21f0d625c 100644 --- a/tao/debug.cpp +++ b/tao/debug.cpp @@ -7,10 +7,6 @@ #include "tao/debug.h" -ACE_RCSID (tao, - debug, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Export unsigned int TAO_debug_level = 0; diff --git a/tao/default_client.cpp b/tao/default_client.cpp index 14bceeee6a3..76931bb7fda 100644 --- a/tao/default_client.cpp +++ b/tao/default_client.cpp @@ -18,11 +18,6 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" -ACE_RCSID (tao, - default_client, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void) diff --git a/tao/default_resource.cpp b/tao/default_resource.cpp index 9b13d90abfa..cf218ad78d7 100644 --- a/tao/default_resource.cpp +++ b/tao/default_resource.cpp @@ -27,10 +27,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (tao, - default_resource, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Codeset_Parameters::TAO_Codeset_Parameters (void) @@ -1217,9 +1213,7 @@ TAO_Default_Resource_Factory::create_fragmentation_strategy ( } } - ACE_AUTO_PTR_RESET (strategy, - tmp, - TAO_GIOP_Fragmentation_Strategy); + ACE_auto_ptr_reset (strategy, tmp); return strategy; } diff --git a/tao/default_server.cpp b/tao/default_server.cpp index a2b920384be..a9a07a7181e 100644 --- a/tao/default_server.cpp +++ b/tao/default_server.cpp @@ -5,10 +5,6 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" -ACE_RCSID (tao, - default_server, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void) diff --git a/tao/operation_details.cpp b/tao/operation_details.cpp index 81a3229e9fb..916cb7876e9 100644 --- a/tao/operation_details.cpp +++ b/tao/operation_details.cpp @@ -15,10 +15,6 @@ # include "tao/operation_details.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - operation_details, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Exception * diff --git a/tao/params.cpp b/tao/params.cpp index aa56422ed7a..4008d358ca9 100644 --- a/tao/params.cpp +++ b/tao/params.cpp @@ -11,10 +11,6 @@ #include "ace/Service_Config.h" #include "tao/Invocation_Utils.h" -ACE_RCSID (tao, - params, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ORB_Parameters::TAO_ORB_Parameters (void) diff --git a/tao/target_specification.cpp b/tao/target_specification.cpp index 5f15463f345..00e0bc3564d 100644 --- a/tao/target_specification.cpp +++ b/tao/target_specification.cpp @@ -7,6 +7,3 @@ #include "tao/target_specification.inl" #endif /* !defined INLINE */ -ACE_RCSID (tao, - target_specification, - "$Id$") -- cgit v1.2.1