diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-04 09:26:56 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-04 09:26:56 +0000 |
| commit | 95308be2e75a55ea78e0bd56e486e5f65b6ee60a (patch) | |
| tree | da21be1d8871e4d8f1fb0cc6f36f6de06584e8c0 | |
| parent | 93ea04d5325d1228d58e24ba13c92ec23dc57bc5 (diff) | |
| download | ATCD-95308be2e75a55ea78e0bd56e486e5f65b6ee60a.tar.gz | |
ChangeLogTag:Thu Nov 3 09:26:21 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
375 files changed, 2544 insertions, 453 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index abd4a8c9e8d..ca7e754765e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -69,6 +69,8 @@ Thu Nov 3 09:26:21 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * tao/Collocated_Invocation.h: * tao/Connector_Registry.h: * tao/Object_Ref_Table.h: + * tao/PolicyFactory_Registry_Factory.cpp: + * tao/PolicyFactory_Registry_Factory.h: * tao/Profile.h: * tao/Resource_Factory.h: * tao/Stub.h: @@ -410,11 +412,379 @@ Thu Nov 3 09:26:21 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * tao/ObjRefTemplate/ORT_Adapter_Impl.h: * tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp: * tao/ObjRefTemplate/ObjectReferenceTemplate_i.h: + * tao/PI/ClientRequestInfo.cpp: + * tao/PI/ClientRequestInfo.h: + * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp: + * tao/PI/ClientRequestInterceptor_Adapter_Impl.h: + * tao/PI/ClientRequestInterceptor_Adapter_Impl.inl: + * tao/PI/ClientRequestInterceptor_Factory_Impl.cpp: + * tao/PI/ClientRequestInterceptor_Factory_Impl.h: + * tao/PI/Interceptor_List_T.cpp: + * tao/PI/Interceptor_List_T.h: + * tao/PI/ORBInitInfo.cpp: + * tao/PI/ORBInitInfo.h: + * tao/PI/ORBInitInfo.inl: + * tao/PI/ORBInitializer_Registry_Impl.cpp: + * tao/PI/ORBInitializer_Registry_Impl.h: + * tao/PI/PI.cpp: + * tao/PI/PI.h: + * tao/PI/PICurrent.cpp: + * tao/PI/PICurrent.h: + * tao/PI/PICurrent.inl: + * tao/PI/PICurrent_Copy_Callback.cpp: + * tao/PI/PICurrent_Copy_Callback.h: + * tao/PI/PICurrent_Impl.cpp: + * tao/PI/PICurrent_Impl.h: + * tao/PI/PICurrent_Impl.inl: + * tao/PI/PICurrent_Loader.cpp: + * tao/PI/PICurrent_Loader.h: + * tao/PI/PolicyFactory_Loader.cpp: + * tao/PI/PolicyFactory_Loader.h: + * tao/PI/PolicyFactory_Registry.cpp: + * tao/PI/PolicyFactory_Registry.h: + * tao/PI/RequestInfo_Util.cpp: + * tao/PI/RequestInfo_Util.h: + * tao/PI_Server/PICurrent_Guard.cpp: + * tao/PI_Server/PICurrent_Guard.h: + * tao/PI_Server/PI_Server.cpp: + * tao/PI_Server/PI_Server.h: + * tao/PI_Server/PI_Server_Loader.cpp: + * tao/PI_Server/PI_Server_Loader.h: + * tao/PI_Server/Policy_Creator_T.h: + * tao/PI_Server/PortableServer_ORBInitializer.cpp: + * tao/PI_Server/PortableServer_ORBInitializer.h: + * tao/PI_Server/PortableServer_PolicyFactory.cpp: + * tao/PI_Server/PortableServer_PolicyFactory.h: + * tao/PI_Server/ServerInterceptorAdapter.cpp: + * tao/PI_Server/ServerInterceptorAdapter.h: + * tao/PI_Server/ServerRequestInfo.cpp: + * tao/PI_Server/ServerRequestInfo.h: + * tao/PI_Server/ServerRequestInfo.inl: + * tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp: + * tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h: + * tao/PortableServer/Active_Object_Map.cpp: + * tao/PortableServer/Active_Object_Map.h: + * tao/PortableServer/Active_Object_Map.i: + * tao/PortableServer/Active_Object_Map_Entry.cpp: + * tao/PortableServer/Active_Object_Map_Entry.h: + * tao/PortableServer/Active_Policy_Strategies.cpp: + * tao/PortableServer/Active_Policy_Strategies.h: + * tao/PortableServer/Active_Policy_Strategies.inl: + * tao/PortableServer/Adapter_Activator.cpp: + * tao/PortableServer/Adapter_Activator.h: + * tao/PortableServer/Any_SArg_Traits.h: + * tao/PortableServer/BD_String_SArgument_T.cpp: + * tao/PortableServer/BD_String_SArgument_T.h: + * tao/PortableServer/BD_String_SArgument_T.inl: + * tao/PortableServer/Basic_SArgument_T.cpp: + * tao/PortableServer/Basic_SArgument_T.h: + * tao/PortableServer/Basic_SArgument_T.inl: + * tao/PortableServer/Basic_SArguments.h: + * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp: + * tao/PortableServer/Collocated_Object_Proxy_Broker.h: + * tao/PortableServer/Creation_Time.h: + * tao/PortableServer/Creation_Time.inl: + * tao/PortableServer/Default_Acceptor_Filter.cpp: + * tao/PortableServer/Default_Acceptor_Filter.h: + * tao/PortableServer/Default_Policy_Validator.cpp: + * tao/PortableServer/Default_Policy_Validator.h: + * tao/PortableServer/Default_Servant_Dispatcher.cpp: + * tao/PortableServer/Default_Servant_Dispatcher.h: + * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp: + * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h: + * tao/PortableServer/Fixed_Array_SArgument_T.cpp: + * tao/PortableServer/Fixed_Array_SArgument_T.h: + * tao/PortableServer/Fixed_Array_SArgument_T.inl: + * tao/PortableServer/Fixed_Size_SArgument_T.cpp: + * tao/PortableServer/Fixed_Size_SArgument_T.h: + * tao/PortableServer/Fixed_Size_SArgument_T.inl: + * tao/PortableServer/IdAssignmentPolicy.cpp: + * tao/PortableServer/IdAssignmentPolicy.h: + * tao/PortableServer/IdAssignmentStrategy.cpp: + * tao/PortableServer/IdAssignmentStrategy.h: + * tao/PortableServer/IdAssignmentStrategyFactory.h: + * tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp: + * tao/PortableServer/IdAssignmentStrategyFactoryImpl.h: + * tao/PortableServer/IdAssignmentStrategySystem.cpp: + * tao/PortableServer/IdAssignmentStrategySystem.h: + * tao/PortableServer/IdAssignmentStrategyUser.cpp: + * tao/PortableServer/IdAssignmentStrategyUser.h: + * tao/PortableServer/IdUniquenessPolicy.cpp: + * tao/PortableServer/IdUniquenessPolicy.h: + * tao/PortableServer/IdUniquenessStrategy.h: + * tao/PortableServer/IdUniquenessStrategyFactory.h: + * tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp: + * tao/PortableServer/IdUniquenessStrategyFactoryImpl.h: + * tao/PortableServer/IdUniquenessStrategyMultiple.cpp: + * tao/PortableServer/IdUniquenessStrategyMultiple.h: + * tao/PortableServer/IdUniquenessStrategyUnique.cpp: + * tao/PortableServer/IdUniquenessStrategyUnique.h: + * tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp: + * tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h: + * tao/PortableServer/ImR_Client_Adapter.cpp: + * tao/PortableServer/ImR_Client_Adapter.h: + * tao/PortableServer/ImplicitActivationPolicy.cpp: + * tao/PortableServer/ImplicitActivationPolicy.h: + * tao/PortableServer/ImplicitActivationStrategy.cpp: + * tao/PortableServer/ImplicitActivationStrategy.h: + * tao/PortableServer/ImplicitActivationStrategyExplicit.cpp: + * tao/PortableServer/ImplicitActivationStrategyExplicit.h: + * tao/PortableServer/ImplicitActivationStrategyFactory.h: + * tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp: + * tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h: + * tao/PortableServer/ImplicitActivationStrategyImplicit.cpp: + * tao/PortableServer/ImplicitActivationStrategyImplicit.h: + * tao/PortableServer/Key_Adapters.cpp: + * tao/PortableServer/Key_Adapters.h: + * tao/PortableServer/LifespanPolicy.cpp: + * tao/PortableServer/LifespanPolicy.h: + * tao/PortableServer/LifespanStrategy.cpp: + * tao/PortableServer/LifespanStrategy.h: + * tao/PortableServer/LifespanStrategyFactory.h: + * tao/PortableServer/LifespanStrategyFactoryImpl.cpp: + * tao/PortableServer/LifespanStrategyFactoryImpl.h: + * tao/PortableServer/LifespanStrategyPersistent.cpp: + * tao/PortableServer/LifespanStrategyPersistent.h: + * tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp: + * tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h: + * tao/PortableServer/LifespanStrategyTransient.cpp: + * tao/PortableServer/LifespanStrategyTransient.h: + * tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp: + * tao/PortableServer/LifespanStrategyTransientFactoryImpl.h: + * tao/PortableServer/Local_Servant_Base.cpp: + * tao/PortableServer/Local_Servant_Base.h: + * tao/PortableServer/Local_Servant_Base.inl: + * tao/PortableServer/Non_Servant_Upcall.cpp: + * tao/PortableServer/Non_Servant_Upcall.h: + * tao/PortableServer/Non_Servant_Upcall.inl: + * tao/PortableServer/ORT_Adapter.cpp: + * tao/PortableServer/ORT_Adapter.h: + * tao/PortableServer/ORT_Adapter_Factory.cpp: + * tao/PortableServer/ORT_Adapter_Factory.h: + * tao/PortableServer/Object_Adapter.cpp: + * tao/PortableServer/Object_Adapter.h: + * tao/PortableServer/Object_Adapter.i: + * tao/PortableServer/Object_Adapter_Factory.cpp: + * tao/PortableServer/Object_Adapter_Factory.h: + * tao/PortableServer/Object_SArg_Traits.h: + * tao/PortableServer/Object_SArgument_T.cpp: + * tao/PortableServer/Object_SArgument_T.h: + * tao/PortableServer/Object_SArgument_T.inl: + * tao/PortableServer/Operation_Table.cpp: + * tao/PortableServer/Operation_Table.h: + * tao/PortableServer/Operation_Table_Binary_Search.cpp: + * tao/PortableServer/Operation_Table_Binary_Search.h: + * tao/PortableServer/Operation_Table_Dynamic_Hash.cpp: + * tao/PortableServer/Operation_Table_Dynamic_Hash.h: + * tao/PortableServer/Operation_Table_Linear_Search.cpp: + * tao/PortableServer/Operation_Table_Linear_Search.h: + * tao/PortableServer/Operation_Table_Perfect_Hash.cpp: + * tao/PortableServer/Operation_Table_Perfect_Hash.h: + * tao/PortableServer/POAManager.cpp: + * tao/PortableServer/POAManager.h: + * tao/PortableServer/POAManager.i: + * tao/PortableServer/POA_Cached_Policies.cpp: + * tao/PortableServer/POA_Cached_Policies.h: + * tao/PortableServer/POA_Cached_Policies.i: + * tao/PortableServer/POA_Current.cpp: + * tao/PortableServer/POA_Current.h: + * tao/PortableServer/POA_Current.inl: + * tao/PortableServer/POA_Current_Factory.cpp: + * tao/PortableServer/POA_Current_Factory.h: + * tao/PortableServer/POA_Current_Impl.cpp: + * tao/PortableServer/POA_Current_Impl.h: + * tao/PortableServer/POA_Current_Impl.inl: + * tao/PortableServer/POA_Guard.cpp: + * tao/PortableServer/POA_Guard.h: + * tao/PortableServer/POA_Policy_Set.cpp: + * tao/PortableServer/POA_Policy_Set.h: + * tao/PortableServer/POA_Policy_Set.i: + * tao/PortableServer/Policy_Strategy.h: + * tao/PortableServer/PortableServer.cpp: + * tao/PortableServer/PortableServer.h: + * tao/PortableServer/PortableServer_Functions.cpp: + * tao/PortableServer/PortableServer_Functions.h: + * tao/PortableServer/PortableServer_WFunctions.cpp: + * tao/PortableServer/PortableServer_WFunctions.h: + * tao/PortableServer/Regular_POA.cpp: + * tao/PortableServer/Regular_POA.h: + * tao/PortableServer/Regular_POA.inl: + * tao/PortableServer/RequestProcessingPolicy.cpp: + * tao/PortableServer/RequestProcessingPolicy.h: + * tao/PortableServer/RequestProcessingStrategy.cpp: + * tao/PortableServer/RequestProcessingStrategy.h: + * tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp: + * tao/PortableServer/RequestProcessingStrategyAOMOnly.h: + * tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp: + * tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h: + * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp: + * tao/PortableServer/RequestProcessingStrategyDefaultServant.h: + * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp: + * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h: + * tao/PortableServer/RequestProcessingStrategyFactory.h: + * tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp: + * tao/PortableServer/RequestProcessingStrategyFactoryImpl.h: + * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp: + * tao/PortableServer/RequestProcessingStrategyServantActivator.h: + * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp: + * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h: + * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp: + * tao/PortableServer/RequestProcessingStrategyServantLocator.h: + * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp: + * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h: + * tao/PortableServer/RequestProcessingStrategyServantManager.cpp: + * tao/PortableServer/RequestProcessingStrategyServantManager.h: + * tao/PortableServer/Root_POA.cpp: + * tao/PortableServer/Root_POA.h: + * tao/PortableServer/Root_POA.inl: + * tao/PortableServer/SArg_Traits_T.h: + * tao/PortableServer/ServantRetentionPolicy.cpp: + * tao/PortableServer/ServantRetentionPolicy.h: + * tao/PortableServer/ServantRetentionStrategy.h: + * tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp: + * tao/PortableServer/ServantRetentionStrategyFactoryImpl.h: + * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp: + * tao/PortableServer/ServantRetentionStrategyNonRetain.h: + * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp: + * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h: + * tao/PortableServer/ServantRetentionStrategyRetain.cpp: + * tao/PortableServer/ServantRetentionStrategyRetain.h: + * tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp: + * tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h: + * tao/PortableServer/Servant_Base.cpp: * tao/PortableServer/Servant_Base.h: + * tao/PortableServer/Servant_Base.i: + * tao/PortableServer/Servant_Dispatcher.cpp: + * tao/PortableServer/Servant_Dispatcher.h: + * tao/PortableServer/Servant_Location.h: + * tao/PortableServer/Servant_Upcall.cpp: + * tao/PortableServer/Servant_Upcall.h: + * tao/PortableServer/Servant_Upcall.inl: + * tao/PortableServer/Special_Basic_SArgument_T.cpp: + * tao/PortableServer/Special_Basic_SArgument_T.h: + * tao/PortableServer/Special_Basic_SArgument_T.inl: + * tao/PortableServer/Special_Basic_SArguments.h: + * tao/PortableServer/StrategyFactory.cpp: + * tao/PortableServer/StrategyFactory.h: + * tao/PortableServer/ThreadPolicy.cpp: + * tao/PortableServer/ThreadPolicy.h: + * tao/PortableServer/ThreadStrategy.cpp: + * tao/PortableServer/ThreadStrategy.h: + * tao/PortableServer/ThreadStrategyFactory.h: + * tao/PortableServer/ThreadStrategyFactoryImpl.cpp: + * tao/PortableServer/ThreadStrategyFactoryImpl.h: + * tao/PortableServer/ThreadStrategyORBControl.cpp: + * tao/PortableServer/ThreadStrategyORBControl.h: + * tao/PortableServer/ThreadStrategySingle.cpp: + * tao/PortableServer/ThreadStrategySingle.h: + * tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp: + * tao/PortableServer/ThreadStrategySingleFactoryImpl.h: + * tao/PortableServer/TypeCode_SArg_Traits.h: + * tao/PortableServer/UB_String_SArgument_T.cpp: + * tao/PortableServer/UB_String_SArgument_T.h: + * tao/PortableServer/UB_String_SArgument_T.inl: + * tao/PortableServer/UB_String_SArguments.h: + * tao/PortableServer/Upcall_Command.cpp: + * tao/PortableServer/Upcall_Command.h: + * tao/PortableServer/Upcall_Wrapper.cpp: + * tao/PortableServer/Upcall_Wrapper.h: + * tao/PortableServer/Var_Array_SArgument_T.cpp: + * tao/PortableServer/Var_Array_SArgument_T.h: + * tao/PortableServer/Var_Array_SArgument_T.inl: + * tao/PortableServer/get_arg.h: + * tao/PortableServer/poa_macros.h: + * tao/RTCORBA/Continuous_Priority_Mapping.cpp: + * tao/RTCORBA/Continuous_Priority_Mapping.h: + * tao/RTCORBA/Direct_Priority_Mapping.cpp: + * tao/RTCORBA/Direct_Priority_Mapping.h: + * tao/RTCORBA/Linear_Network_Priority_Mapping.cpp: + * tao/RTCORBA/Linear_Network_Priority_Mapping.h: + * tao/RTCORBA/Linear_Priority_Mapping.cpp: + * tao/RTCORBA/Linear_Priority_Mapping.h: + * tao/RTCORBA/Multi_Priority_Mapping.cpp: + * tao/RTCORBA/Multi_Priority_Mapping.h: + * tao/RTCORBA/Network_Priority_Mapping.cpp: + * tao/RTCORBA/Network_Priority_Mapping.h: + * tao/RTCORBA/Network_Priority_Mapping_Manager.cpp: + * tao/RTCORBA/Network_Priority_Mapping_Manager.i: + * tao/RTCORBA/Priority_Mapping.cpp: + * tao/RTCORBA/Priority_Mapping.h: + * tao/RTCORBA/Priority_Mapping_Manager.cpp: + * tao/RTCORBA/Priority_Mapping_Manager.h: + * tao/RTCORBA/Priority_Mapping_Manager.i: + * tao/RTCORBA/RTCORBA.cpp: + * tao/RTCORBA/RTCORBA.h: + * tao/RTCORBA/RT_Current.cpp: + * tao/RTCORBA/RT_Current.h: + * tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp: + * tao/RTCORBA/RT_Endpoint_Selector_Factory.h: + * tao/RTCORBA/RT_Endpoint_Utils.cpp: + * tao/RTCORBA/RT_Endpoint_Utils.h: + * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp: + * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h: + * tao/RTCORBA/RT_Mutex.cpp: + * tao/RTCORBA/RT_Mutex.h: + * tao/RTCORBA/RT_ORB.cpp: + * tao/RTCORBA/RT_ORB.h: + * tao/RTCORBA/RT_ORBInitializer.cpp: + * tao/RTCORBA/RT_ORBInitializer.h: + * tao/RTCORBA/RT_ORB_Loader.cpp: + * tao/RTCORBA/RT_ORB_Loader.h: + * tao/RTCORBA/RT_PolicyFactory.cpp: + * tao/RTCORBA/RT_PolicyFactory.h: + * tao/RTCORBA/RT_Policy_i.cpp: + * tao/RTCORBA/RT_Policy_i.h: + * tao/RTCORBA/RT_Protocols_Hooks.cpp: + * tao/RTCORBA/RT_Protocols_Hooks.h: + * tao/RTCORBA/RT_Stub.cpp: * tao/RTCORBA/RT_Stub.h: + * tao/RTCORBA/RT_Stub_Factory.cpp: + * tao/RTCORBA/RT_Stub_Factory.h: + * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp: + * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h: + * tao/RTCORBA/RT_Transport_Descriptor.cpp: + * tao/RTCORBA/RT_Transport_Descriptor.h: + * tao/RTCORBA/RT_Transport_Descriptor.inl: + * tao/RTCORBA/RT_Transport_Descriptor_Property.cpp: * tao/RTCORBA/RT_Transport_Descriptor_Property.h: + * tao/RTCORBA/RT_Transport_Descriptor_Property.inl: + * tao/RTCORBA/Thread_Pool.cpp: + * tao/RTCORBA/Thread_Pool.h: + * tao/RTCORBA/Thread_Pool.inl: + * tao/RTCORBA/rtcorba_typedefs.h: + * tao/RTPortableServer/RTPortableServer.cpp: + * tao/RTPortableServer/RTPortableServer.h: + * tao/RTPortableServer/RT_Acceptor_Filters.cpp: + * tao/RTPortableServer/RT_Acceptor_Filters.h: + * tao/RTPortableServer/RT_Collocation_Resolver.cpp: + * tao/RTPortableServer/RT_Collocation_Resolver.h: + * tao/RTPortableServer/RT_Object_Adapter_Factory.cpp: + * tao/RTPortableServer/RT_Object_Adapter_Factory.h: + * tao/RTPortableServer/RT_POA.cpp: + * tao/RTPortableServer/RT_POA.h: + * tao/RTPortableServer/RT_POA.i: + * tao/RTPortableServer/RT_Policy_Validator.cpp: + * tao/RTPortableServer/RT_Policy_Validator.h: + * tao/RTPortableServer/RT_Servant_Dispatcher.cpp: + * tao/RTPortableServer/RT_Servant_Dispatcher.h: + * tao/RTScheduling/Current.cpp: + * tao/RTScheduling/Current.h: + * tao/RTScheduling/Distributable_Thread.cpp: + * tao/RTScheduling/Distributable_Thread.h: + * tao/RTScheduling/RTScheduler.cpp: + * tao/RTScheduling/RTScheduler.h: + * tao/RTScheduling/RTScheduler_Initializer.cpp: + * tao/RTScheduling/RTScheduler_Initializer.h: + * tao/RTScheduling/RTScheduler_Loader.cpp: + * tao/RTScheduling/RTScheduler_Loader.h: + * tao/RTScheduling/RTScheduler_Manager.cpp: + * tao/RTScheduling/RTScheduler_Manager.h: + * tao/RTScheduling/RTScheduler_Manager.i: + * tao/RTScheduling/Request_Interceptor.cpp: + * tao/RTScheduling/Request_Interceptor.h: + * tao/RTScheduling/ThreadAction.h: * tao/Valuetype/AbstractBase_Invocation_Adapter.h: - + Added versioned namespace support. Removed unnecessary *_Export keywords from symbols that need not diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index 31576b668d6..0330a5be272 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -1333,7 +1333,6 @@ libTAO_PortableServer_la_SOURCES = \ PortableServer/LifespanStrategyTransientFactoryImpl.cpp \ PortableServer/Local_Servant_Base.cpp \ PortableServer/Non_Servant_Upcall.cpp \ - PortableServer/ORT_Adapter.cpp \ PortableServer/ORT_Adapter_Factory.cpp \ PortableServer/Object_Adapter.cpp \ PortableServer/Object_Adapter_Factory.cpp \ diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp index 58117d9903c..b78a8a21746 100644 --- a/TAO/tao/PI/ClientRequestInfo.cpp +++ b/TAO/tao/PI/ClientRequestInfo.cpp @@ -4,7 +4,7 @@ #if TAO_HAS_INTERCEPTORS == 1 -ACE_RCSID (tao, +ACE_RCSID (PI, ClientRequestInfo, "$Id$") @@ -24,6 +24,8 @@ ACE_RCSID (tao, #include "tao/Service_Context.h" #include "tao/Exception_Data.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO::Invocation_Base *inv) : invocation_ (inv), rs_pi_current_ (), @@ -746,4 +748,6 @@ TAO_ClientRequestInfo::tao_ft_retention_id (void) const return this->invocation_->operation_details ().ft_retention_id (); } +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h index e25052b7d67..3508967140b 100644 --- a/TAO/tao/PI/ClientRequestInfo.h +++ b/TAO/tao/PI/ClientRequestInfo.h @@ -41,6 +41,7 @@ #include "tao/Invocation_Utils.h" #include "tao/TimeBaseC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Service_Context; @@ -68,7 +69,7 @@ namespace Messaging * @brief Implementation of the PortableInterceptor::ClientRequestInfo * interface. */ -class TAO_PI_Export TAO_ClientRequestInfo +class TAO_ClientRequestInfo : public virtual PortableInterceptor::ClientRequestInfo, public virtual TAO_Local_RefCounted_Object { @@ -290,6 +291,8 @@ private: TAO::PICurrent_Copy_Callback copy_callback_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp index 574fc987085..3c05b186fcf 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp @@ -17,6 +17,8 @@ ACE_RCSID (PI, ClientRequestInterceptorAdapter_Impl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { void @@ -266,4 +268,6 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h index 2ec52a987aa..f76c07b3a55 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h @@ -34,6 +34,7 @@ #include "ClientRequestInterceptorC.h" #include "tao/ClientRequestInterceptor_Adapter.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -120,6 +121,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ClientRequestInterceptor_Adapter_Impl.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl index e234f5d02ac..c1c7835148d 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { ACE_INLINE @@ -9,3 +11,5 @@ namespace TAO { } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp index 890ce995534..4a6aee7b43d 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- // ================================================================= /** @@ -24,6 +24,8 @@ ACE_RCSID (PI, ClientRequestInterceptor_Factory_Impl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::ClientRequestInterceptor_Adapter* TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create (void) { @@ -34,6 +36,8 @@ TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create (void) return obj; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_ClientRequestInterceptor_Adapter_Factory_Impl, ACE_TEXT ("ClientRequestInterceptor_Adapter_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h index c3b959f156f..95985693ff8 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ - +// -*- C++ -*- //============================================================================= /** @@ -27,8 +26,10 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "ace/Service_Config.h" #include "tao/ClientRequestInterceptor_Adapter_Factory.h" +#include "ace/Service_Config.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -42,6 +43,8 @@ public: virtual TAO::ClientRequestInterceptor_Adapter *create (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_ClientRequestInterceptor_Adapter_Factory_Impl) ACE_FACTORY_DECLARE (TAO_PI, TAO_ClientRequestInterceptor_Adapter_Factory_Impl) diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp index 5f3b6e74581..bbb53171661 100644 --- a/TAO/tao/PI/Interceptor_List_T.cpp +++ b/TAO/tao/PI/Interceptor_List_T.cpp @@ -10,6 +10,8 @@ #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { template <typename InterceptorType> @@ -147,3 +149,5 @@ namespace TAO ACE_CHECK; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h index bb3a29db0a8..c6f11f4d75b 100644 --- a/TAO/tao/PI/Interceptor_List_T.h +++ b/TAO/tao/PI/Interceptor_List_T.h @@ -24,6 +24,8 @@ #include "tao/SystemException.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { class Interceptor; @@ -70,6 +72,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Interceptor_List_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp index 658f11d6238..4819da4e5c6 100644 --- a/TAO/tao/PI/ORBInitInfo.cpp +++ b/TAO/tao/PI/ORBInitInfo.cpp @@ -24,6 +24,8 @@ ACE_RCSID (TAO, #include "ace/OS_NS_string.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Traits specializations for TAO_ORBInitInfo. TAO_ORBInitInfo_ptr @@ -383,3 +385,4 @@ const char* TAO_ORBInitInfo::_interface_repository_id (void) const return "IDL:TAO_ORBInitInfo:1.0"; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h index f83238f0305..0598088c330 100644 --- a/TAO/tao/PI/ORBInitInfo.h +++ b/TAO/tao/PI/ORBInitInfo.h @@ -35,6 +35,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; class TAO_ORBInitInfo; typedef TAO_ORBInitInfo *TAO_ORBInitInfo_ptr; @@ -293,6 +295,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ORBInitInfo.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PI/ORBInitInfo.inl b/TAO/tao/PI/ORBInitInfo.inl index bb8d32ed135..f151fd2711d 100644 --- a/TAO/tao/PI/ORBInitInfo.inl +++ b/TAO/tao/PI/ORBInitInfo.inl @@ -3,6 +3,8 @@ // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_ORB_Core * TAO_ORBInitInfo::orb_core (void) const { @@ -20,3 +22,5 @@ TAO_ORBInitInfo::slot_count (void) const { return this->slot_count_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp index 55efc3a28a9..f55ab7055a1 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp @@ -14,6 +14,9 @@ ACE_RCSID (PI, ORBInitializer_Registry, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::ORBInitializer_Registry::ORBInitializer_Registry (void) : lock_ (), initializers_ () @@ -178,6 +181,8 @@ TAO::ORBInitializer_Registry::post_init ( } } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (ORBInitializer_Registry, ACE_TEXT ("ORBInitializer_Registry"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h index 66464bf77d8..188408562e5 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h @@ -31,6 +31,8 @@ #include "ace/Service_Config.h" #include "ace/Recursive_Thread_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -39,7 +41,7 @@ namespace TAO * @brief Global list that contains all portable interceptor ORB * initializers. */ - class TAO_PI_Export ORBInitializer_Registry + class ORBInitializer_Registry : public ORBInitializer_Registry_Adapter { public: @@ -87,6 +89,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (ORBInitializer_Registry) ACE_FACTORY_DECLARE (TAO_PI, ORBInitializer_Registry) diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp index 3088ad074b6..1d4592cc6ca 100644 --- a/TAO/tao/PI/PI.cpp +++ b/TAO/tao/PI/PI.cpp @@ -8,6 +8,8 @@ ACE_RCSID (PI, PI, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_PI_Init::Initializer (void) { @@ -20,3 +22,4 @@ TAO_PI_Init::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_ORBInitializer_Registry); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h index d1849e3c781..514bde89974 100644 --- a/TAO/tao/PI/PI.h +++ b/TAO/tao/PI/PI.h @@ -21,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_PI_Init * @@ -37,6 +41,8 @@ static int TAO_Requires_PI_Initializer = TAO_PI_Init::Initializer (); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #define TAO_PI_SAFE_INCLUDE diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp index dc3bf53884a..4ef4820f623 100644 --- a/TAO/tao/PI/PICurrent.cpp +++ b/TAO/tao/PI/PICurrent.cpp @@ -18,6 +18,7 @@ ACE_RCSID (tao, #include "tao/TAO_Server_Request.h" #include "tao/SystemException.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::PICurrent::PICurrent (TAO_ORB_Core &orb_core) : orb_core_ (orb_core), @@ -120,5 +121,6 @@ TAO::PICurrent::initialize (PortableInterceptor::SlotId sc return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h index 3c52b628bae..c0354474538 100644 --- a/TAO/tao/PI/PICurrent.h +++ b/TAO/tao/PI/PICurrent.h @@ -35,6 +35,8 @@ # pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Forward declarations. class TAO_ORB_Core; @@ -134,6 +136,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "PICurrent.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PI/PICurrent.inl b/TAO/tao/PI/PICurrent.inl index 7fd7fc77b1b..aca42f2786c 100644 --- a/TAO/tao/PI/PICurrent.inl +++ b/TAO/tao/PI/PICurrent.inl @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE PortableInterceptor::SlotId TAO::PICurrent::slot_count (void) const @@ -9,3 +10,4 @@ TAO::PICurrent::slot_count (void) const return this->slot_count_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PICurrent_Copy_Callback.cpp b/TAO/tao/PI/PICurrent_Copy_Callback.cpp index 7ad09ada95b..10cdea0a1d0 100644 --- a/TAO/tao/PI/PICurrent_Copy_Callback.cpp +++ b/TAO/tao/PI/PICurrent_Copy_Callback.cpp @@ -9,6 +9,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::PICurrent_Copy_Callback::PICurrent_Copy_Callback (void) : src_ (0), dst_ (0) @@ -56,4 +58,6 @@ TAO::PICurrent_Copy_Callback::src_and_dst (PICurrent_Impl * src, this->dst_ = dst; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/PICurrent_Copy_Callback.h b/TAO/tao/PI/PICurrent_Copy_Callback.h index 5b5f17d4505..b1e7678d990 100644 --- a/TAO/tao/PI/PICurrent_Copy_Callback.h +++ b/TAO/tao/PI/PICurrent_Copy_Callback.h @@ -25,6 +25,9 @@ #if TAO_HAS_INTERCEPTORS == 1 + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { class PICurrent_Impl; @@ -65,6 +68,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_INTERCEPTORS == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp index ecbccc90274..ae083b7eb2f 100644 --- a/TAO/tao/PI/PICurrent_Impl.cpp +++ b/TAO/tao/PI/PICurrent_Impl.cpp @@ -17,6 +17,9 @@ ACE_RCSID (tao, #include "tao/SystemException.h" #include "ace/Log_Msg.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::PICurrent_Impl::PICurrent_Impl (void) : slot_table_ (), lc_slot_table_ (0), @@ -112,4 +115,6 @@ TAO::PICurrent_Impl::execute_destruction_callback ( this->lc_slot_table_ = old_lc_slot_table; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h index d374f174e4b..92646834256 100644 --- a/TAO/tao/PI/PICurrent_Impl.h +++ b/TAO/tao/PI/PICurrent_Impl.h @@ -30,6 +30,8 @@ #include "ace/Array_Base.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Forward declarations. class TAO_ORB_Core; @@ -135,6 +137,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "PICurrent_Impl.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PI/PICurrent_Impl.inl b/TAO/tao/PI/PICurrent_Impl.inl index 8b708ec7f5a..67d5132e4f9 100644 --- a/TAO/tao/PI/PICurrent_Impl.inl +++ b/TAO/tao/PI/PICurrent_Impl.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void TAO::PICurrent_Impl::copy_callback (TAO::PICurrent_Copy_Callback *cb) { @@ -53,3 +55,5 @@ TAO::PICurrent_Impl::lc_slot_table (void) const { return this->lc_slot_table_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp index 1423cd7c663..e0c38011bf1 100644 --- a/TAO/tao/PI/PICurrent_Loader.cpp +++ b/TAO/tao/PI/PICurrent_Loader.cpp @@ -25,6 +25,8 @@ ACE_RCSID (PI, PICurrent_Loader, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Object_ptr TAO_PICurrent_Loader::create_object ( CORBA::ORB_ptr orb, @@ -40,6 +42,8 @@ TAO_PICurrent_Loader::create_object ( return obj; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_PICurrent_Loader, ACE_TEXT ("PICurrent_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/PI/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h index 931d2216082..3cac77a3754 100644 --- a/TAO/tao/PI/PICurrent_Loader.h +++ b/TAO/tao/PI/PICurrent_Loader.h @@ -31,6 +31,8 @@ #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_PI_Export TAO_PICurrent_Loader : public TAO_Object_Loader { @@ -43,6 +45,8 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_PICurrent_Loader) ACE_FACTORY_DECLARE (TAO_PI, TAO_PICurrent_Loader) diff --git a/TAO/tao/PI/PolicyFactory_Loader.cpp b/TAO/tao/PI/PolicyFactory_Loader.cpp index bea75ef3a0f..cdf999d5dcf 100644 --- a/TAO/tao/PI/PolicyFactory_Loader.cpp +++ b/TAO/tao/PI/PolicyFactory_Loader.cpp @@ -21,6 +21,8 @@ ACE_RCSID (PI, PolicyFactory_Loader, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::PolicyFactory_Registry_Adapter* TAO_PolicyFactory_Loader::create (void) { @@ -37,6 +39,8 @@ TAO_PolicyFactory_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_PolicyFactory_Loader); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_PolicyFactory_Loader, ACE_TEXT ("PolicyFactory_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/PI/PolicyFactory_Loader.h b/TAO/tao/PI/PolicyFactory_Loader.h index 10b0280f4d9..45b6792a09a 100644 --- a/TAO/tao/PI/PolicyFactory_Loader.h +++ b/TAO/tao/PI/PolicyFactory_Loader.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= @@ -26,6 +26,8 @@ #include "tao/PolicyFactory_Registry_Factory.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_PI_Export TAO_PolicyFactory_Loader : public TAO_PolicyFactory_Registry_Factory { @@ -37,12 +39,14 @@ public: static int Initializer (void); }; -ACE_STATIC_SVC_DECLARE (TAO_PolicyFactory_Loader) -ACE_FACTORY_DECLARE (TAO_PI, TAO_PolicyFactory_Loader) - static int TAO_Requires_PolicyFactory_Initializer = TAO_PolicyFactory_Loader::Initializer (); +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_STATIC_SVC_DECLARE (TAO_PolicyFactory_Loader) +ACE_FACTORY_DECLARE (TAO_PI, TAO_PolicyFactory_Loader) + #include /**/ "ace/post.h" #endif /* TAO_POLICYFACTORY_LOADER_H */ diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp index 7999bbecc3c..bf3b3ea65ac 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.cpp +++ b/TAO/tao/PI/PolicyFactory_Registry.cpp @@ -11,6 +11,8 @@ ACE_RCSID (PI, // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void) : factories_ (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE) { @@ -117,3 +119,5 @@ TAO_PolicyFactory_Registry::factory_exists (CORBA::PolicyType & type) const return (this->factories_.find (type) == 0); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h index 05a5747d112..882f386c70c 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.h +++ b/TAO/tao/PI/PolicyFactory_Registry.h @@ -16,17 +16,19 @@ #include /**/ "ace/pre.h" -#include "pi_export.h" +#include "tao/Basic_Types.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Basic_Types.h" +#include "tao/PolicyFactory_Registry_Adapter.h" #include "ace/Map_Manager.h" #include "ace/Null_Mutex.h" #include "ace/CORBA_macros.h" -#include "tao/Basic_Types.h" -#include "tao/PolicyFactory_Registry_Adapter.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_PolicyFactory_Registry @@ -36,7 +38,7 @@ * ORB-specific registry that contains all portable interceptor * policy factories. */ -class TAO_PI_Export TAO_PolicyFactory_Registry +class TAO_PolicyFactory_Registry : public TAO::PolicyFactory_Registry_Adapter { public: @@ -93,6 +95,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_POLICY_FACTORY_REGISTRY_H */ diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp index 191a30e51c4..fc92d156262 100644 --- a/TAO/tao/PI/RequestInfo_Util.cpp +++ b/TAO/tao/PI/RequestInfo_Util.cpp @@ -16,6 +16,7 @@ ACE_RCSID (tao, RequestInfo_Util, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL Dynamic::ParameterList * TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL) @@ -97,15 +98,16 @@ TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any 0, ENOMEM), CORBA::COMPLETED_NO)); + ACE_CHECK_RETURN (any); if (tk_void_any) { any->_tao_set_typecode (CORBA::_tc_void); } - // No need to do an ACE_CHECK_RETURN. The caller should do that. - return any; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h index f32b1d8dc2f..6cb834ea586 100644 --- a/TAO/tao/PI/RequestInfo_Util.h +++ b/TAO/tao/PI/RequestInfo_Util.h @@ -28,6 +28,8 @@ #include "ace/CORBA_macros.h" #include "pi_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class StringSeq; @@ -80,6 +82,8 @@ public: //@} }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/PICurrent_Guard.cpp b/TAO/tao/PI_Server/PICurrent_Guard.cpp index 9aff070ca96..8b09a985e2c 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.cpp +++ b/TAO/tao/PI_Server/PICurrent_Guard.cpp @@ -14,6 +14,8 @@ ACE_RCSID (PortableServer, #include "tao/PI/PICurrent.h" #include "tao/PI/PICurrent_Impl.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request, bool tsc_to_rsc) : src_ (0), @@ -81,5 +83,6 @@ TAO::PICurrent_Guard::~PICurrent_Guard (void) } } +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI_Server/PICurrent_Guard.h b/TAO/tao/PI_Server/PICurrent_Guard.h index 6bbda8f3ec4..8c65f753948 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.h +++ b/TAO/tao/PI_Server/PICurrent_Guard.h @@ -25,6 +25,8 @@ #if TAO_HAS_INTERCEPTORS == 1 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Forward declarations. class TAO_ServerRequest; @@ -99,6 +101,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_INTERCEPTORS == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/PI_Server.cpp b/TAO/tao/PI_Server/PI_Server.cpp index 9217b032970..f6ddf992cf6 100644 --- a/TAO/tao/PI_Server/PI_Server.cpp +++ b/TAO/tao/PI_Server/PI_Server.cpp @@ -6,6 +6,9 @@ ACE_RCSID (PI_Server, PI_Server, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_PI_Server_Init::Initializer (void) { @@ -16,3 +19,4 @@ TAO_PI_Server_Init::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_PI_Server_Loader); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/PI_Server.h b/TAO/tao/PI_Server/PI_Server.h index e130e064684..97f00c064ca 100644 --- a/TAO/tao/PI_Server/PI_Server.h +++ b/TAO/tao/PI_Server/PI_Server.h @@ -21,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_PI_Server_Init * @@ -37,6 +41,8 @@ static int TAO_Requires_PI_Server_Initializer = TAO_PI_Server_Init::Initializer (); +TAO_END_VERSIONED_NAMESPACE_DECL + #define TAO_PI_SERVER_SAFE_INCLUDE #include "ServerRequestInterceptorC.h" #include "ServerRequestInfoC.h" diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp index 289f000a139..85cc532ddc9 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.cpp +++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp @@ -12,6 +12,8 @@ ACE_RCSID (PI_Server, PI_Server_Loader, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_PI_Server_Loader::TAO_PI_Server_Loader (void) { } @@ -27,13 +29,13 @@ TAO_PI_Server_Loader::init (int, { ACE_TRACE ("TAO_PI_Server_Loader::init"); - static int initialized = 0; + static bool initialized = false; // Only allow initialization once. if (initialized) return 0; - initialized = 1; + initialized = true; // Register the ORB initializer. ACE_DECLARE_NEW_CORBA_ENV; @@ -66,10 +68,13 @@ TAO_PI_Server_Loader::init (int, return -1; } ACE_ENDTRY; + ACE_CHECK_RETURN (-1); return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ///////////////////////////////////////////////////////////////////// ACE_FACTORY_DEFINE (TAO_PI_Server, TAO_PI_Server_Loader) diff --git a/TAO/tao/PI_Server/PI_Server_Loader.h b/TAO/tao/PI_Server/PI_Server_Loader.h index 02228437152..b557672350e 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.h +++ b/TAO/tao/PI_Server/PI_Server_Loader.h @@ -1,15 +1,10 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** * @file PI_Server_Loader.h * * $Id$ - * - * Header file for Loading RTScheduler. - * - * - * @author Yamuna Krishnamurthy <yamuna@oomworks.com> */ //============================================================================= @@ -23,9 +18,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_PI_Server_Export TAO_PI_Server_Loader : public ACE_Service_Object { public: @@ -40,6 +38,8 @@ public: ACE_TCHAR* []); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PI_Server, TAO_PI_Server_Loader) ACE_FACTORY_DECLARE (TAO_PI_Server, TAO_PI_Server_Loader) diff --git a/TAO/tao/PI_Server/Policy_Creator_T.h b/TAO/tao/PI_Server/Policy_Creator_T.h index 42a5f422d4f..6b4784fb607 100644 --- a/TAO/tao/PI_Server/Policy_Creator_T.h +++ b/TAO/tao/PI_Server/Policy_Creator_T.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -21,11 +21,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server { - template <class POLICYTYPE, class POLICYVALUE> + template <class POLICYTYPE, typename POLICYVALUE> void create_policy ( POLICYTYPE *& policy, POLICYVALUE &value, @@ -44,6 +46,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_POLICY_CREATOR_T_H */ diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp index 8f891627c1b..fe2cab45e13 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp @@ -12,16 +12,21 @@ ACE_RCSID (PI_Server, PortableServer_ORBInitializer, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void -TAO_PortableServer_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) +TAO_PortableServer_ORBInitializer::pre_init ( + PortableInterceptor::ORBInitInfo_ptr + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -TAO_PortableServer_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) +TAO_PortableServer_ORBInitializer::post_init ( + PortableInterceptor::ORBInitInfo_ptr info + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info @@ -30,8 +35,9 @@ TAO_PortableServer_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_p } void -TAO_PortableServer_ORBInitializer::register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) +TAO_PortableServer_ORBInitializer::register_policy_factories ( + PortableInterceptor::ORBInitInfo_ptr info + ACE_ENV_ARG_DECL) { // Register the PortableServer policy factories. PortableInterceptor::PolicyFactory_ptr tmp; @@ -49,7 +55,7 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (PortableIntercepto // Bind the same policy factory to all PortableServer related policy // types since a single policy factory is used to create each of the // different types of PortableServer policies. - CORBA::PolicyType type[] = { + static CORBA::PolicyType const type[] = { #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::THREAD_POLICY_ID, PortableServer::IMPLICIT_ACTIVATION_POLICY_ID, @@ -61,10 +67,10 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (PortableIntercepto PortableServer::ID_ASSIGNMENT_POLICY_ID }; - const CORBA::PolicyType *end = + CORBA::PolicyType const * end = type + sizeof (type) / sizeof (type[0]); - for (CORBA::PolicyType *i = type; + for (CORBA::PolicyType const *i = type; i != end; ++i) { @@ -97,3 +103,5 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (PortableIntercepto ACE_CHECK; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h index 903e5adc5f9..8aba0600ea2 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h @@ -15,17 +15,19 @@ #include /**/ "ace/pre.h" -#include "pi_server_export.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PI/PI.h" #include "tao/LocalObject.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// PortableServer ORB initializer. -class TAO_PI_Server_Export TAO_PortableServer_ORBInitializer +class TAO_PortableServer_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, public virtual TAO_Local_RefCounted_Object { @@ -56,6 +58,8 @@ private: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_ORB_INITIALIZER_H */ diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp index 9171b7c7e33..40a5c95dd6f 100644 --- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp +++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp @@ -15,6 +15,8 @@ ACE_RCSID (PortableServer, PortableServer_PolicyFactory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Policy_ptr TAO_PortableServer_PolicyFactory::create_policy ( CORBA::PolicyType type, @@ -111,3 +113,5 @@ TAO_PortableServer_PolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h index d24a1e001aa..1a0c06ff21a 100644 --- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h +++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h @@ -15,17 +15,18 @@ #include /**/ "ace/pre.h" -#include "pi_server_export.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PI/PI.h" #include "tao/LocalObject.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Policy factory for all PortableServer related policies. -class TAO_PI_Server_Export TAO_PortableServer_PolicyFactory +class TAO_PortableServer_PolicyFactory : public virtual PortableInterceptor::PolicyFactory, public virtual TAO_Local_RefCounted_Object { @@ -37,6 +38,8 @@ public: CORBA::PolicyError)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_POLICY_FACTORY_H */ diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp index 114ee17f0cf..076bc989ab6 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp @@ -19,6 +19,8 @@ ACE_RCSID (PortableServer, #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableInterceptor.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::ServerRequestInterceptor_Adapter_Impl::ServerRequestInterceptor_Adapter_Impl (void) { } @@ -497,17 +499,17 @@ TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current (void) TAO::PICurrent_Impl *pi = 0; ACE_NEW_RETURN (pi, TAO::PICurrent_Impl, - 0); + pi); return pi; } TAO::PICurrent_Copy_Callback * TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current_callback (void) { - TAO::PICurrent_Copy_Callback *pi = 0; + TAO::PICurrent_Copy_Callback * pi = 0; ACE_NEW_RETURN (pi, TAO::PICurrent_Copy_Callback, - 0); + pi); return pi; } @@ -520,15 +522,15 @@ TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current ( void TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current_callback ( - TAO::PICurrent_Copy_Callback *callback) + TAO::PICurrent_Copy_Callback * callback) { delete callback; } void TAO::ServerRequestInterceptor_Adapter_Impl::execute_command ( - TAO_ServerRequest &server_request, - TAO::Upcall_Command &command + TAO_ServerRequest & server_request, + TAO::Upcall_Command & command ACE_ENV_ARG_DECL) { TAO::PICurrent_Guard pi_guard (server_request, @@ -539,5 +541,6 @@ TAO::ServerRequestInterceptor_Adapter_Impl::execute_command ( ACE_CHECK; } +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h index 6fa2e115b6c..6cb2878b1e6 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h @@ -20,13 +20,12 @@ #include /**/ "ace/pre.h" -#include "pi_server_export.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/orbconf.h" #if TAO_HAS_INTERCEPTORS == 1 @@ -36,6 +35,9 @@ #include "tao/ServerRequestInterceptor_Adapter.h" #include "tao/Basic_Types.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { typedef Interceptor_List< ::PortableInterceptor::ServerRequestInterceptor> @@ -56,8 +58,8 @@ namespace TAO * A convenient helper class to invoke registered server request * interceptor(s). */ - class TAO_PI_Server_Export ServerRequestInterceptor_Adapter_Impl : - public ServerRequestInterceptor_Adapter + class ServerRequestInterceptor_Adapter_Impl + : public ServerRequestInterceptor_Adapter { public: @@ -178,6 +180,8 @@ namespace TAO } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_INTERCEPTORS */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp index 2b613ec3738..08b9d7cf019 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp @@ -4,7 +4,7 @@ #if (TAO_HAS_INTERCEPTORS == 1) -ACE_RCSID (PortableServer, +ACE_RCSID (PI_Server, ServerRequestInfo, "$Id$") @@ -29,6 +29,7 @@ ACE_RCSID (PortableServer, # include "ServerRequestInfo.inl" # endif /* !__ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::ULong TAO::ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -586,4 +587,6 @@ TAO::ServerRequestInfo::add_reply_service_context ( } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index 7b79d9eed83..e084e9afaad 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -27,7 +27,6 @@ #if (TAO_HAS_INTERCEPTORS == 1) -#include "pi_server_export.h" #include "ServerRequestInfoC.h" #include "tao/LocalObject.h" #include "tao/OctetSeqC.h" @@ -40,6 +39,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ServerRequest; class TAO_Service_Context; @@ -65,9 +66,9 @@ namespace TAO * @note This class is currently not meant to be reference counted * since it is instantiated on the stack. */ - class TAO_PI_Server_Export ServerRequestInfo - : public virtual PortableInterceptor::ServerRequestInfo, - public virtual CORBA::LocalObject + class ServerRequestInfo + : public virtual PortableInterceptor::ServerRequestInfo + , public virtual CORBA::LocalObject { public: @@ -298,6 +299,7 @@ namespace TAO } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL # if defined (__ACE_INLINE__) # include "ServerRequestInfo.inl" diff --git a/TAO/tao/PI_Server/ServerRequestInfo.inl b/TAO/tao/PI_Server/ServerRequestInfo.inl index 3ba06ed412b..09985532ba8 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.inl +++ b/TAO/tao/PI_Server/ServerRequestInfo.inl @@ -5,6 +5,8 @@ #include "tao/PortableServer/Servant_Upcall.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO::ServerRequestInfo::ServerRequestInfo ( TAO_ServerRequest & server_request, @@ -54,3 +56,5 @@ TAO::ServerRequestInfo::server_request (void) return this->server_request_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp index f3d26ea86be..fb3092c69be 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp @@ -24,6 +24,9 @@ ACE_RCSID (PI_Server, PolicyFactory_Loader, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::ServerRequestInterceptor_Adapter* TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create (void) { @@ -34,6 +37,8 @@ TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create (void) return obj; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_ServerRequestInterceptor_Adapter_Factory_Impl, ACE_TEXT ("ServerRequestInterceptor_Adapter_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h index 45e80d4c25e..2a0c59b8440 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ - +// -*- C++ -*- //============================================================================= /** @@ -30,6 +29,8 @@ #include "ace/Service_Config.h" #include "tao/ServerRequestInterceptor_Adapter_Factory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { class ServerRequestInterceptor_Adapter; @@ -42,6 +43,8 @@ public: virtual TAO::ServerRequestInterceptor_Adapter *create (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_ServerRequestInterceptor_Adapter_Factory_Impl) ACE_FACTORY_DECLARE (TAO_PI_Server, TAO_ServerRequestInterceptor_Adapter_Factory_Impl) diff --git a/TAO/tao/PolicyFactory_Registry_Factory.cpp b/TAO/tao/PolicyFactory_Registry_Factory.cpp index 9f817b31876..67220dd3b66 100644 --- a/TAO/tao/PolicyFactory_Registry_Factory.cpp +++ b/TAO/tao/PolicyFactory_Registry_Factory.cpp @@ -6,6 +6,10 @@ ACE_RCSID (tao, PolicyFactory_Registry_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_PolicyFactory_Registry_Factory::~TAO_PolicyFactory_Registry_Factory (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PolicyFactory_Registry_Factory.h b/TAO/tao/PolicyFactory_Registry_Factory.h index 5d7ac654eaa..6da8fdda14a 100644 --- a/TAO/tao/PolicyFactory_Registry_Factory.h +++ b/TAO/tao/PolicyFactory_Registry_Factory.h @@ -19,8 +19,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { class PolicyFactory_Registry_Adapter; @@ -38,5 +41,7 @@ public: virtual TAO::PolicyFactory_Registry_Adapter* create (void) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" -#endif /* TAO_OBJECT_LOADER_H */ +#endif /* TAO_POLICYFACTORY_REGISTRY_FACTORY_H */ diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index 17361e7c94f..65501458a7a 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -14,6 +14,8 @@ ACE_RCSID(PortableServer, Active_Object_Map, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /* static */ size_t TAO_Active_Object_Map::system_id_size_ = 0; @@ -933,3 +935,4 @@ TAO_No_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id, return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index 9cc254b555a..2178eaa4587 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -22,9 +22,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Map_T.h" -#include "tao/Server_Strategy_Factory.h" #include "Servant_Base.h" +#include "tao/Server_Strategy_Factory.h" +#include "ace/Map_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward declarations. class TAO_Id_Uniqueness_Strategy; @@ -613,6 +615,8 @@ public: TAO_Active_Object_Map_Entry &entry); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "Active_Object_Map.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Active_Object_Map.i b/TAO/tao/PortableServer/Active_Object_Map.i index 59824cf5063..5efee6747df 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.i +++ b/TAO/tao/PortableServer/Active_Object_Map.i @@ -1,7 +1,11 @@ +// -*- C++ -*- +// // $Id$ #include "Active_Object_Map_Entry.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE int TAO_Active_Object_Map::is_servant_in_map (PortableServer::Servant servant, int &deactivated) @@ -256,3 +260,5 @@ TAO_Active_Object_Map::system_id_size (void) { return TAO_Active_Object_Map::system_id_size_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp index d7a1fa3fe64..0d9826e86fd 100644 --- a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp @@ -6,6 +6,8 @@ ACE_RCSID(PortableServer, Active_Object_Map_Entry, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void) : user_id_ (), system_id_ (), @@ -16,3 +18,4 @@ TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.h b/TAO/tao/PortableServer/Active_Object_Map_Entry.h index 1c072df4201..f83e5fa642e 100644 --- a/TAO/tao/PortableServer/Active_Object_Map_Entry.h +++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -16,13 +16,14 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "PS_ForwardC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PS_ForwardC.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @struct TAO_Active_Object_Map_Entry @@ -57,6 +58,8 @@ struct TAO_Active_Object_Map_Entry CORBA::Short priority_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ACTIVE_OBJECT_MAP_ENTRY_H */ diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp index 4183da3f356..c11279d30df 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "Active_Policy_Strategies.h" #include "POA_Cached_Policies.h" @@ -37,25 +37,28 @@ ACE_RCSID(PortableServer, Active_Policy_Strategies, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server { - Active_Policy_Strategies::Active_Policy_Strategies() : - thread_strategy_ (0), - request_processing_strategy_ (0), - id_assignment_strategy_ (0), - lifespan_strategy_ (0), - id_uniqueness_strategy_ (0), - implicit_activation_strategy_ (0), - servant_retention_strategy_ (0), - thread_strategy_factory_ (0), - servant_retention_strategy_factory_ (0), - request_processing_strategy_factory_ (0), - lifespan_strategy_factory_ (0), - implicit_activation_strategy_factory_ (0), - id_uniqueness_strategy_factory_ (0), - id_assignment_strategy_factory_ (0) + Active_Policy_Strategies::Active_Policy_Strategies (void) + : thread_strategy_ (0), + request_processing_strategy_ (0), + id_assignment_strategy_ (0), + lifespan_strategy_ (0), + id_uniqueness_strategy_ (0), + implicit_activation_strategy_ (0), + servant_retention_strategy_ (0), + thread_strategy_factory_ (0), + servant_retention_strategy_factory_ (0), + request_processing_strategy_factory_ (0), + lifespan_strategy_factory_ (0), + implicit_activation_strategy_factory_ (0), + id_uniqueness_strategy_factory_ (0), + id_assignment_strategy_factory_ (0) { } @@ -64,104 +67,110 @@ namespace TAO ::TAO_Root_POA *poa ACE_ENV_ARG_DECL) { - thread_strategy_factory_ = + this->thread_strategy_factory_ = ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategyFactory"); - if (thread_strategy_factory_ != 0) - thread_strategy_ = thread_strategy_factory_->create (policies.thread()); + if (this->thread_strategy_factory_ != 0) + this->thread_strategy_ = + this->thread_strategy_factory_->create (policies.thread()); /**/ - id_assignment_strategy_factory_ = + this->id_assignment_strategy_factory_ = ACE_Dynamic_Service<IdAssignmentStrategyFactory>::instance ("IdAssignmentStrategyFactory"); - if (id_assignment_strategy_factory_ != 0) - id_assignment_strategy_ = id_assignment_strategy_factory_->create (policies.id_assignment()); + if (this->id_assignment_strategy_factory_ != 0) + this->id_assignment_strategy_ = + this->id_assignment_strategy_factory_->create (policies.id_assignment()); /**/ - id_uniqueness_strategy_factory_ = + this->id_uniqueness_strategy_factory_ = ACE_Dynamic_Service<IdUniquenessStrategyFactory>::instance ("IdUniquenessStrategyFactory"); - if (id_uniqueness_strategy_factory_ != 0) - id_uniqueness_strategy_ = id_uniqueness_strategy_factory_->create (policies.id_uniqueness()); + if (this->id_uniqueness_strategy_factory_ != 0) + this->id_uniqueness_strategy_ = + this->id_uniqueness_strategy_factory_->create (policies.id_uniqueness()); /**/ - servant_retention_strategy_factory_ = + this->servant_retention_strategy_factory_ = ACE_Dynamic_Service<ServantRetentionStrategyFactory>::instance ("ServantRetentionStrategyFactory"); - if (servant_retention_strategy_factory_ != 0) - servant_retention_strategy_ = - servant_retention_strategy_factory_->create (policies.servant_retention()); + if (this->servant_retention_strategy_factory_ != 0) + this->servant_retention_strategy_ = + this->servant_retention_strategy_factory_->create (policies.servant_retention()); /**/ - request_processing_strategy_factory_ = + this->request_processing_strategy_factory_ = ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyFactory"); - if (request_processing_strategy_factory_ != 0) - request_processing_strategy_ = request_processing_strategy_factory_->create (policies.request_processing(), policies.servant_retention()); + if (this->request_processing_strategy_factory_ != 0) + this->request_processing_strategy_ = + this->request_processing_strategy_factory_->create (policies.request_processing(), policies.servant_retention()); /**/ - lifespan_strategy_factory_ = + this->lifespan_strategy_factory_ = ACE_Dynamic_Service<LifespanStrategyFactory>::instance ("LifespanStrategyFactory"); - if (lifespan_strategy_factory_ != 0) - lifespan_strategy_ = lifespan_strategy_factory_->create (policies.lifespan()); + if (this->lifespan_strategy_factory_ != 0) + this->lifespan_strategy_ = + this->lifespan_strategy_factory_->create (policies.lifespan()); /**/ - implicit_activation_strategy_factory_ = + this->implicit_activation_strategy_factory_ = ACE_Dynamic_Service<ImplicitActivationStrategyFactory>::instance ("ImplicitActivationStrategyFactory"); - if (implicit_activation_strategy_factory_ != 0) - implicit_activation_strategy_ = implicit_activation_strategy_factory_->create (policies.implicit_activation()); + if (this->implicit_activation_strategy_factory_ != 0) + this->implicit_activation_strategy_ = + this->implicit_activation_strategy_factory_->create (policies.implicit_activation()); /**/ // @todo, check if all pointers are != 0 - if (lifespan_strategy_ != 0) + if (this->lifespan_strategy_ != 0) { - lifespan_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); + this->lifespan_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - if (request_processing_strategy_ != 0) + if (this->request_processing_strategy_ != 0) { - request_processing_strategy_->strategy_init (poa, policies.servant_retention() ACE_ENV_ARG_PARAMETER); + this->request_processing_strategy_->strategy_init (poa, policies.servant_retention() ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - if (id_uniqueness_strategy_ != 0) + if (this->id_uniqueness_strategy_ != 0) { - id_uniqueness_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); + this->id_uniqueness_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - if (implicit_activation_strategy_ != 0) + if (this->implicit_activation_strategy_ != 0) { - implicit_activation_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); + this->implicit_activation_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - if (thread_strategy_ != 0) + if (this->thread_strategy_ != 0) { - thread_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); + this->thread_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - if (servant_retention_strategy_ != 0) + if (this->servant_retention_strategy_ != 0) { - servant_retention_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); + this->servant_retention_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - if (id_assignment_strategy_ != 0) + if (this->id_assignment_strategy_ != 0) { - id_assignment_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); + this->id_assignment_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -170,61 +179,63 @@ namespace TAO Active_Policy_Strategies::cleanup (ACE_ENV_SINGLE_ARG_DECL) { - if (lifespan_strategy_ != 0) + if (this->lifespan_strategy_ != 0) { - lifespan_strategy_factory_->destroy (lifespan_strategy_ ACE_ENV_ARG_PARAMETER); + this->lifespan_strategy_factory_->destroy (lifespan_strategy_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - lifespan_strategy_ = 0; + this->lifespan_strategy_ = 0; } - if (request_processing_strategy_ != 0) + if (this->request_processing_strategy_ != 0) { - request_processing_strategy_factory_->destroy (request_processing_strategy_ ACE_ENV_ARG_PARAMETER); + this->request_processing_strategy_factory_->destroy (request_processing_strategy_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - request_processing_strategy_ = 0; + this->request_processing_strategy_ = 0; } - if (id_uniqueness_strategy_ != 0) + if (this->id_uniqueness_strategy_ != 0) { - id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_ ACE_ENV_ARG_PARAMETER); + this->id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - id_uniqueness_strategy_ = 0; + this->id_uniqueness_strategy_ = 0; } - if (implicit_activation_strategy_ != 0) + if (this->implicit_activation_strategy_ != 0) { - implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_ ACE_ENV_ARG_PARAMETER); + this->implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - implicit_activation_strategy_ = 0; + this->implicit_activation_strategy_ = 0; } - if (thread_strategy_ != 0) + if (this->thread_strategy_ != 0) { - thread_strategy_factory_->destroy (thread_strategy_ ACE_ENV_ARG_PARAMETER); + this->thread_strategy_factory_->destroy (thread_strategy_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - thread_strategy_ = 0; + this->thread_strategy_ = 0; } - if (servant_retention_strategy_ != 0) + if (this->servant_retention_strategy_ != 0) { - servant_retention_strategy_factory_->destroy (servant_retention_strategy_ ACE_ENV_ARG_PARAMETER); + this->servant_retention_strategy_factory_->destroy (servant_retention_strategy_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - servant_retention_strategy_ = 0; + this->servant_retention_strategy_ = 0; } - if (id_assignment_strategy_ != 0) + if (this->id_assignment_strategy_ != 0) { - id_assignment_strategy_factory_->destroy (id_assignment_strategy_ ACE_ENV_ARG_PARAMETER); + this->id_assignment_strategy_factory_->destroy (id_assignment_strategy_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - id_assignment_strategy_ = 0; + this->id_assignment_strategy_ = 0; } } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h index aedab179e3f..96e167692e9 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.h +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h @@ -12,16 +12,18 @@ #ifndef TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H #define TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H + #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/Environment.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/CORBA_macros.h" -#include "tao/Environment.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Root_POA; @@ -49,10 +51,10 @@ namespace TAO /** * This class stores the active policy strategies used for a certain POA. */ - class TAO_PortableServer_Export Active_Policy_Strategies + class Active_Policy_Strategies { public: - Active_Policy_Strategies(); + Active_Policy_Strategies (void); void update (Cached_Policies &policies, TAO_Root_POA* poa @@ -94,9 +96,12 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "Active_Policy_Strategies.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" + #endif /* TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H */ diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl index ff04b364157..ab606b04b1a 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl @@ -1,4 +1,8 @@ -// @(#) $Id$ +// -*- C++ -*- +// +// $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -8,49 +12,51 @@ namespace TAO ThreadStrategy* Active_Policy_Strategies::thread_strategy (void) const { - return thread_strategy_; + return this->thread_strategy_; } ACE_INLINE RequestProcessingStrategy* Active_Policy_Strategies::request_processing_strategy (void) const { - return request_processing_strategy_; + return this->request_processing_strategy_; } ACE_INLINE IdAssignmentStrategy * Active_Policy_Strategies::id_assignment_strategy (void) const { - return id_assignment_strategy_; + return this->id_assignment_strategy_; } ACE_INLINE IdUniquenessStrategy * Active_Policy_Strategies::id_uniqueness_strategy (void) const { - return id_uniqueness_strategy_; + return this->id_uniqueness_strategy_; } ACE_INLINE LifespanStrategy* Active_Policy_Strategies::lifespan_strategy (void) const { - return lifespan_strategy_; + return this->lifespan_strategy_; } ACE_INLINE ImplicitActivationStrategy* Active_Policy_Strategies::implicit_activation_strategy (void) const { - return implicit_activation_strategy_; + return this->implicit_activation_strategy_; } ACE_INLINE ServantRetentionStrategy* Active_Policy_Strategies::servant_retention_strategy (void) const { - return servant_retention_strategy_; + return this->servant_retention_strategy_; } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Adapter_Activator.cpp b/TAO/tao/PortableServer/Adapter_Activator.cpp index 4a8a0386ef1..9bdf028c28b 100644 --- a/TAO/tao/PortableServer/Adapter_Activator.cpp +++ b/TAO/tao/PortableServer/Adapter_Activator.cpp @@ -12,6 +12,8 @@ ACE_RCSID (PortableServer, #include "POAManagerC.h" #include "PortableServer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -61,4 +63,6 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/Adapter_Activator.h b/TAO/tao/PortableServer/Adapter_Activator.h index a3cd80dc34c..bac4d5581ab 100644 --- a/TAO/tao/PortableServer/Adapter_Activator.h +++ b/TAO/tao/PortableServer/Adapter_Activator.h @@ -1,11 +1,10 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** * @file Adapter_Activator.h * * $Id$ - * */ //============================================================================= @@ -23,6 +22,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { class POAManager; @@ -55,6 +56,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Any_SArg_Traits.h b/TAO/tao/PortableServer/Any_SArg_Traits.h index abb88199417..21cdd6547cf 100644 --- a/TAO/tao/PortableServer/Any_SArg_Traits.h +++ b/TAO/tao/PortableServer/Any_SArg_Traits.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -24,6 +24,8 @@ #include "tao/PortableServer/Var_Size_SArgument_T.h" #include "tao/PortableServer/portableserver_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Any; @@ -46,6 +48,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ANY_ARG_TRAITS_H */ diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp index 1b9ae8f7adf..f145439f8e7 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp @@ -9,6 +9,7 @@ #include "tao/PortableServer/BD_String_SArgument_T.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename S_var, @@ -156,4 +157,6 @@ interceptor_value (CORBA::Any *any) const #endif /* TAO_HAS_INTERCEPTORS */ +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_BD_STRING_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h index e4cd49d1ab6..fd24af1a112 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.h +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h @@ -25,6 +25,8 @@ #include "tao/Argument.h" #include "tao/Any_Insert_Policy_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -193,6 +195,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/PortableServer/BD_String_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.inl b/TAO/tao/PortableServer/BD_String_SArgument_T.inl index c8727fb3d32..57bfd4f3299 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.inl +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.inl @@ -1,5 +1,9 @@ +// -*- C+ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S, typename S_var, typename to_S, @@ -108,3 +112,4 @@ arg (void) return this->x_.out (); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Basic_SArgument_T.cpp index a6fe3ead5f4..1bd5ab450eb 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Basic_SArgument_T.cpp @@ -9,6 +9,7 @@ #include "tao/PortableServer/Basic_SArgument_T.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename Insert_Policy> CORBA::Boolean @@ -95,4 +96,6 @@ TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) #endif /* TAO_HAS_INTERCEPTORS */ +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_BASIC_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h index 33297cb7adf..074367b1102 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Basic_SArgument_T.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -142,6 +144,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/PortableServer/Basic_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.inl b/TAO/tao/PortableServer/Basic_SArgument_T.inl index 195d7bca229..9c7f0f0de3c 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Basic_SArgument_T.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S, typename Insert_Policy> ACE_INLINE TAO::In_Basic_SArgument_T<S,Insert_Policy>::In_Basic_SArgument_T (void) @@ -60,3 +62,4 @@ TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::arg (void) return this->x_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Basic_SArguments.h b/TAO/tao/PortableServer/Basic_SArguments.h index 933476cb806..433002d391f 100644 --- a/TAO/tao/PortableServer/Basic_SArguments.h +++ b/TAO/tao/PortableServer/Basic_SArguments.h @@ -25,6 +25,7 @@ #include "tao/PortableServer/Basic_SArgument_T.h" #include "tao/PortableServer/SArg_Traits_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -106,6 +107,8 @@ namespace TAO } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_BASIC_SARGUMENTS_H */ diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index dd27ae99b0f..7893522c2d1 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -16,6 +16,7 @@ ACE_RCSID (PortableServer, Collocated_Object_Proxy_Broker, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -329,3 +330,5 @@ _TAO_collocation_Object_Proxy_Broker_Factory_Initializer ( reinterpret_cast<size_t> (_TAO_collocation_Object_Proxy_Broker_Factory_Initializer ) ); + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h index 070e24ba648..09258ae40d5 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h @@ -26,6 +26,8 @@ #include "tao/Object_Proxy_Broker.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -73,6 +75,8 @@ namespace TAO /// proxy broker. All the CORBA::Object share the proxy broker. TAO::Collocated_Object_Proxy_Broker *the_tao_collocated_object_proxy_broker (void); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_COLLOCATED_OBJECT_PROXY_BROKER_H*/ diff --git a/TAO/tao/PortableServer/Creation_Time.h b/TAO/tao/PortableServer/Creation_Time.h index 5804c01a892..22f3ab07172 100644 --- a/TAO/tao/PortableServer/Creation_Time.h +++ b/TAO/tao/PortableServer/Creation_Time.h @@ -24,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -91,6 +93,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "Creation_Time.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Creation_Time.inl b/TAO/tao/PortableServer/Creation_Time.inl index 18df03c4bed..f629b10e91b 100644 --- a/TAO/tao/PortableServer/Creation_Time.inl +++ b/TAO/tao/PortableServer/Creation_Time.inl @@ -5,6 +5,8 @@ #include "tao/orbconf.h" /* For POA_NO_TIMESTAMP definition. */ #include "ace/OS_NS_string.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -121,3 +123,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp index 6a054ee480f..d4cd7e7d5ee 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp @@ -9,6 +9,9 @@ ACE_RCSID(PortableServer, Default_Acceptor_Filter, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void) { } @@ -51,3 +54,5 @@ TAO_Default_Acceptor_Filter::encode_endpoints (TAO_MProfile &mprofile) return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h index d6a859d0e3d..70bea1b23f7 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h @@ -6,8 +6,7 @@ * * $Id$ * - * Default strategy for populating mprofile - * + * Default strategy for populating mprofile * * @author Marina Spivak <marina@cs.wustl.edu> * @author Carlos O'Ryan <coryan@uci.edu> @@ -17,6 +16,7 @@ #ifndef TAO_DEFAULT_ACCEPTOR_FILTER_H #define TAO_DEFAULT_ACCEPTOR_FILTER_H + #include /**/ "ace/pre.h" #include "portableserver_export.h" @@ -27,6 +27,8 @@ #include "tao/Acceptor_Filter.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Acceptor; /** @@ -55,5 +57,8 @@ public: int encode_endpoints (TAO_MProfile &mprofile); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" + #endif /* TAO_DEFAULT_ACCEPTOR_FILTER_H */ diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp index e3b7c8a597b..963494e89fe 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp +++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "Default_Policy_Validator.h" #include "tao/ORB_Core.h" @@ -11,6 +11,8 @@ ACE_RCSID (PortableServer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_POA_Default_Policy_Validator::TAO_POA_Default_Policy_Validator ( TAO_ORB_Core &orb_core) : TAO_Policy_Validator (orb_core) @@ -122,7 +124,6 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies #endif /* TAO_HAS_MINIMUM_POA == 0 */ } - CORBA::Boolean TAO_POA_Default_Policy_Validator::legal_policy_impl (CORBA::PolicyType type) { @@ -147,3 +148,5 @@ TAO_POA_Default_Policy_Validator::merge_policies_impl ( ACE_ENV_ARG_DECL_NOT_USED) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h index 0b9f8a33a29..e698fc939df 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.h +++ b/TAO/tao/PortableServer/Default_Policy_Validator.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file Default_Policy_Validator.h @@ -24,6 +26,8 @@ #include "tao/Policy_Validator.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_PortableServer_Export TAO_POA_Default_Policy_Validator : public TAO_Policy_Validator { @@ -58,5 +62,7 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_DEFAULT_POLICY_VALIDATOR_H_ */ diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp index dbd38fd621c..ebc50a296d0 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "Default_Servant_Dispatcher.h" #include "Root_POA.h" @@ -7,6 +7,8 @@ ACE_RCSID(PortableServer, Default_Servant_Dispatcher, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void) { } @@ -63,3 +65,5 @@ TAO_Default_Servant_Dispatcher::post_invoke ( TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h index b0af90027e3..092e4c498d3 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -22,6 +22,8 @@ #include "Servant_Dispatcher.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Default_Servant_Dispatcher * @@ -69,5 +71,7 @@ public: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_DEFAULT_SERVANT_DISPATCHER_H */ diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp index 026f9f44ff5..ce0a4559e45 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp @@ -16,6 +16,8 @@ ACE_RCSID (PortableServer, Direct_Collocation_Upcall_Wrapper, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO::Direct_Collocation_Upcall_Wrapper::upcall ( CORBA::Object_ptr obj, @@ -68,3 +70,4 @@ ACE_THROW_SPEC ((CORBA::Exception)) ACE_CHECK; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h index 2d7dc5ff483..cb71f0f1d13 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h @@ -25,9 +25,11 @@ #include "tao/orbconf.h" #include "tao/Collocation_Strategy.h" #include "tao/Exception.h" -#include "ace/CORBA_macros.h" #include "tao/CORBA_methods.h" #include "tao/Pseudo_VarOut_T.h" +#include "ace/CORBA_macros.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -69,6 +71,7 @@ namespace TAO } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp index 1d90e7de4bc..9ddd1ea1d36 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp @@ -9,6 +9,8 @@ #include "tao/PortableServer/Fixed_Array_SArgument_T.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S, typename S_slice, typename S_forany, @@ -157,4 +159,6 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice, #endif /* TAO_HAS_INTERCEPTORS */ +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_FIXED_ARRAY_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h index 4fb052bbfc7..e03fb2c19f4 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h @@ -22,6 +22,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -174,6 +177,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/PortableServer/Fixed_Array_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl index 24a54390d96..0708aa7ebf1 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S, typename S_slice, typename S_forany, @@ -117,3 +119,5 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice, { return this->x_._retn_arg (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp index a145529ec0c..2fc65cd99cf 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp @@ -9,6 +9,7 @@ #include "tao/PortableServer/Fixed_Size_SArgument_T.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename Insert_Policy> @@ -109,4 +110,6 @@ TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( #endif /* TAO_HAS_INTERCEPTORS */ -#endif /* TAO_FIXED_SIZE_SARGUMENT_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_FIXED_SIZE_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h index b7d77ee05d3..fb9f6ea732a 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h @@ -12,7 +12,6 @@ */ //============================================================================= - #ifndef TAO_FIXED_SIZE_SARGUMENT_T_H #define TAO_FIXED_SIZE_SARGUMENT_T_H @@ -24,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -215,6 +216,7 @@ namespace TAO } +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "tao/PortableServer/Fixed_Size_SArgument_T.inl" diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl index 05e29ce35a6..3a265297105 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S, typename Insert_Policy> ACE_INLINE @@ -65,3 +67,5 @@ TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) { return this->x_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp index 89efde0e574..d370bab76b6 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp @@ -5,6 +5,8 @@ ACE_RCSID (PortableServer, IdAssignmentPolicy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -62,3 +64,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h index d467272019e..93f739b008b 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h @@ -30,6 +30,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -65,6 +67,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp index 87cb019e4b5..be643e68966 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp @@ -6,12 +6,16 @@ ACE_RCSID (PortableServer, IdAssignmentStrategy, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server { void - IdAssignmentStrategy::strategy_init (TAO_Root_POA * /*poa*/ ACE_ENV_ARG_DECL_NOT_USED) + IdAssignmentStrategy::strategy_init (TAO_Root_POA * /*poa*/ + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -39,3 +43,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h index e3085c33be2..7563b9ad297 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.h @@ -22,12 +22,14 @@ #include "tao/Basic_Types.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server { - class IdAssignmentStrategy : - public Policy_Strategy + class IdAssignmentStrategy + : public Policy_Strategy { public: virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL); @@ -51,5 +53,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ID_ASSIGNMENT_STRATEGY_H */ diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h index 73a5e0c050a..5d8acd9152d 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h @@ -23,6 +23,8 @@ #include "StrategyFactory.h" #include "IdAssignmentPolicyC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -44,5 +46,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp index b83c49ecf00..02351fb636c 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp @@ -8,6 +8,8 @@ ACE_RCSID (PortableServer, IdAssignmentStrategyFactoryImpl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -52,6 +54,15 @@ namespace TAO // Noop because both types are singletons } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( IdAssignmentStrategyFactoryImpl, ACE_TEXT ("IdAssignmentStrategyFactory"), diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h index 2ae4e43b745..0eb0edf94f8 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h @@ -20,8 +20,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Service_Config.h" #include "IdAssignmentStrategyFactory.h" +#include "ace/Service_Config.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -39,11 +41,20 @@ namespace TAO IdAssignmentStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyFactoryImpl) } } #include /**/ "ace/post.h" + #endif /* TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp index fbdbaed75c4..6032515ab46 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp @@ -6,6 +6,9 @@ ACE_RCSID (PortableServer, Id_Assignment_Strategy, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -21,7 +24,15 @@ namespace TAO { return true; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_FACTORY_DEFINE (ACE_Local_Service, IdAssignmentStrategySystem) ACE_STATIC_SVC_DEFINE ( diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h index 6471e5bce3f..626c78d2806 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h @@ -23,6 +23,8 @@ #include "IdAssignmentStrategy.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -35,7 +37,15 @@ namespace TAO virtual bool has_system_id (void) const; }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategySystem) ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategySystem) } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp index 9895db85f2e..0bd2a13e238 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp @@ -6,6 +6,8 @@ ACE_RCSID (PortableServer, Id_Assignment_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -21,7 +23,15 @@ namespace TAO { return false; } + } +} +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { ACE_FACTORY_DEFINE (ACE_Local_Service, IdAssignmentStrategyUser) ACE_STATIC_SVC_DEFINE ( @@ -34,4 +44,3 @@ namespace TAO ) } } - diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h index f202c12c6ad..e57f0d04e90 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h @@ -23,6 +23,8 @@ #include "IdAssignmentStrategy.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -35,7 +37,15 @@ namespace TAO virtual bool has_system_id (void) const; }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyUser) ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyUser) } diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp index 7dc969af49c..e466546bfc7 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp @@ -5,6 +5,8 @@ ACE_RCSID (PortableServer, IdUniquenessPolicy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -62,3 +64,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h index 3064d77924a..46f738c75e2 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h @@ -30,6 +30,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -65,6 +67,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h index bdb2f08e182..d58778c0644 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategy.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h @@ -24,6 +24,8 @@ #include "IdUniquenessPolicyC.h" #include "PS_ForwardC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -48,5 +50,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ID_UNIQUENESS_STRATEGY_H */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h index c4c28dd26e4..574462419aa 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h @@ -23,6 +23,8 @@ #include "StrategyFactory.h" #include "IdUniquenessPolicyC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -45,5 +47,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp index 7a9aae6ed11..4653ff90ed5 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp @@ -8,6 +8,8 @@ ACE_RCSID (PortableServer, IdUniquenessStrategyFactoryImpl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -79,6 +81,15 @@ namespace TAO } } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( IdUniquenessStrategyFactoryImpl, ACE_TEXT ("IdUniquenessStrategyFactory"), diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h index 88d453a4a59..a162d4e5b1e 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h @@ -23,6 +23,8 @@ #include "ace/Service_Config.h" #include "IdUniquenessStrategyFactory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -39,7 +41,15 @@ namespace TAO IdUniquenessStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE (IdUniquenessStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyFactoryImpl) } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp index 19b94296166..19bea676fde 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp @@ -6,6 +6,9 @@ ACE_RCSID (PortableServer, Id_Uniqueness_Strategy, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -45,6 +48,15 @@ namespace TAO return ::PortableServer::MULTIPLE_ID; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyMultiple) ACE_STATIC_SVC_DEFINE ( diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h index e706f0e7b87..bfa3efd7457 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h @@ -23,6 +23,8 @@ #include "IdUniquenessStrategy.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -44,6 +46,15 @@ namespace TAO virtual ::PortableServer::IdUniquenessPolicyValue type() const; }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyMultiple) ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyMultiple) } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp index b612a8ffb4d..e29f9d44e98 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -7,6 +7,9 @@ ACE_RCSID (PortableServer, Id_Uniqueness_Strategy, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -57,6 +60,15 @@ namespace TAO return ::PortableServer::UNIQUE_ID; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyUnique) ACE_STATIC_SVC_DEFINE ( diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h index 7af8890f475..b48b840cf3f 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h @@ -50,6 +50,15 @@ namespace TAO TAO_Root_POA* poa_; }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUnique) ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUnique) } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp index 77b597e30c9..79e182a5115 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp @@ -8,6 +8,8 @@ ACE_RCSID (PortableServer, IdUniquenessStrategyUniqueFactoryImpl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -46,6 +48,15 @@ namespace TAO delete strategy; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( IdUniquenessStrategyUniqueFactoryImpl, ACE_TEXT ("IdUniquenessStrategyUniqueFactory"), diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h index 927dda0a86b..2672f0ed7fb 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h @@ -23,6 +23,8 @@ #include "ace/Service_Config.h" #include "IdUniquenessStrategyFactory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -40,6 +42,16 @@ namespace TAO ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl) } diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp index 379a7696117..3b3b163e18e 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "ImR_Client_Adapter.h" @@ -6,14 +6,16 @@ ACE_RCSID (tao, ImR_Client_Adapter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server { - ImR_Client_Adapter::~ImR_Client_Adapter (void) { } } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h index 019cc333669..ba8fd0cdff7 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.h +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -27,6 +27,8 @@ #include "tao/orbconf.h" #include "tao/Environment.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Root_POA; namespace TAO @@ -57,5 +59,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IMR_CLIENT_ADAPTER_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp index 940a0f05b18..6605b4ba97f 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp @@ -7,6 +7,8 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -64,4 +66,6 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h index 6e9f11bea63..c2e61c7c2ea 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h @@ -32,6 +32,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -67,6 +69,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if defined(_MSC_VER) diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp index 0e1e4d3002e..0b9cce6163a 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp @@ -6,6 +6,8 @@ ACE_RCSID (PortableServer, ImplicitActivationStrategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -26,3 +28,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h index fbdaf2cab52..99312a8bff7 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -37,5 +39,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ACTIVATION_STRATEGY_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp index 55f3a61fcef..e23bece269c 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp @@ -6,6 +6,8 @@ ACE_RCSID (PortableServer, ImplicitActivationStrategyExplicit, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -15,7 +17,16 @@ namespace TAO { return false; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyExplicit) ACE_STATIC_SVC_DEFINE ( diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h index 0e03d29c584..ae8ec7ef4f3 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h @@ -23,6 +23,8 @@ #include "ImplicitActivationStrategy.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -33,6 +35,15 @@ namespace TAO public: virtual bool allow_implicit_activation (void) const; }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyExplicit) ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyExplicit) diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h index 48ed323d19d..5692bd3dc99 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h @@ -23,6 +23,8 @@ #include "StrategyFactory.h" #include "ImplicitActivationPolicyC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -44,5 +46,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp index ef3916e288a..61144e1010c 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp @@ -9,6 +9,8 @@ ACE_RCSID (PortableServer, ImplicitActivationStrategyFactoryImpl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -52,7 +54,15 @@ namespace TAO { // Noop because both types are singletons } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyFactoryImpl) ACE_STATIC_SVC_DEFINE ( diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h index 90ff9ea0a63..daef1b9488d 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h @@ -23,6 +23,9 @@ #include "ace/Service_Config.h" #include "ImplicitActivationStrategyFactory.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -39,7 +42,15 @@ namespace TAO ImplicitActivationStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl) } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp index dbc91745bf1..bcade10c028 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp @@ -6,6 +6,9 @@ ACE_RCSID (PortableServer, ImplicitActivationStrategyImplicit, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -15,7 +18,15 @@ namespace TAO { return true; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyImplicit) ACE_STATIC_SVC_DEFINE ( diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h index 766d0aff4cb..80f90adf236 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h @@ -23,6 +23,8 @@ #include "ImplicitActivationStrategy.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -33,11 +35,20 @@ namespace TAO public: virtual bool allow_implicit_activation (void) const; }; + } +} +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyImplicit) ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyImplicit) } } + #include /**/ "ace/post.h" #endif /* TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H */ diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp index 0765402e755..1ffefbd49bc 100644 --- a/TAO/tao/PortableServer/Key_Adapters.cpp +++ b/TAO/tao/PortableServer/Key_Adapters.cpp @@ -10,7 +10,9 @@ ACE_RCSID (PortableServer, Key_Adapters, "$Id$") -//////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void) : counter_ (0) @@ -146,4 +148,5 @@ TAO_Preserve_Original_Key_Adapter::decode (const PortableServer::ObjectId &modif return 0; } -//////////////////////////////////////////////////////////////////////////////// +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/PortableServer/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h index a7f8e544b5c..18d256bfbbf 100644 --- a/TAO/tao/PortableServer/Key_Adapters.h +++ b/TAO/tao/PortableServer/Key_Adapters.h @@ -25,7 +25,9 @@ class ACE_Active_Map_Manager_Key; -//////////////////////////////////////////////////////////////////////////////// +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +/////////////////////////////////////////////////////////////////////////////// /** * @class TAO_Incremental_Key_Generator @@ -116,7 +118,9 @@ public: PortableServer::ObjectId &original_key); }; -//////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// + +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp index 377b34fedd6..f50265f92fa 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.cpp +++ b/TAO/tao/PortableServer/LifespanPolicy.cpp @@ -5,6 +5,8 @@ ACE_RCSID (PortableServer, LifespanPolicy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -62,3 +64,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h index 8d6f3aafc10..da44ce9fa83 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.h +++ b/TAO/tao/PortableServer/LifespanPolicy.h @@ -30,6 +30,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -65,6 +67,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp index 42bec436226..a0866da0c08 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.cpp +++ b/TAO/tao/PortableServer/LifespanStrategy.cpp @@ -15,6 +15,8 @@ ACE_RCSID (PortableServer, LifespanStrategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -47,3 +49,4 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h index 047427364ca..ae84b5a7c9e 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.h +++ b/TAO/tao/PortableServer/LifespanStrategy.h @@ -23,6 +23,8 @@ #include "LifespanPolicyC.h" #include "tao/Object_KeyC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -81,5 +83,7 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_LIFESPANPOLICY_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyFactory.h b/TAO/tao/PortableServer/LifespanStrategyFactory.h index ca53f9f58e0..5249bbf1a3d 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactory.h +++ b/TAO/tao/PortableServer/LifespanStrategyFactory.h @@ -23,6 +23,8 @@ #include "StrategyFactory.h" #include "LifespanPolicyC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -45,5 +47,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp index 8f2fe097b6e..48f91b21a66 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp @@ -8,6 +8,8 @@ ACE_RCSID (PortableServer, LifespanStrategyFactoryImpl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -80,7 +82,15 @@ namespace TAO } } } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( LifespanStrategyFactoryImpl, ACE_TEXT ("LifespanStrategyFactory"), diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h index 273a11a9d0f..f59d8b97e15 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h @@ -23,6 +23,8 @@ #include "ace/Service_Config.h" #include "LifespanStrategyFactory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -40,7 +42,15 @@ namespace TAO LifespanStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyFactoryImpl) } diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp index 5e40ac9785a..355ede75d81 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp @@ -14,6 +14,8 @@ ACE_RCSID (PortableServer, #include "ace/Dynamic_Service.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -153,3 +155,5 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h index 00ea12a2e5c..715f0addb1a 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h @@ -22,6 +22,8 @@ #include "tao/Object_KeyC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class ServerObject_i; namespace TAO @@ -65,5 +67,7 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LIFESPANSTRATEGYPERSISTENT_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp index 1396342b549..77dfbab2b3f 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp @@ -8,6 +8,8 @@ ACE_RCSID (PortableServer, LifespanStrategyFactoryImpl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -45,7 +47,15 @@ namespace TAO delete strategy; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( LifespanStrategyPersistentFactoryImpl, ACE_TEXT ("LifespanStrategyPersistentFactory"), diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h index a51984d8a51..272da1ca971 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h @@ -23,6 +23,8 @@ #include "ace/Service_Config.h" #include "LifespanStrategyFactory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -40,7 +42,15 @@ namespace TAO LifespanStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl) } diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp index 267707e0f75..799e349d735 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp @@ -13,6 +13,8 @@ ACE_RCSID (PortableServer, #include "tao/ORB_Constants.h" #include "Creation_Time.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -113,3 +115,4 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h index 2b89e8b6c91..404af6124a6 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h @@ -23,6 +23,8 @@ #include "Creation_Time.h" #include "tao/Object_KeyC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -62,5 +64,7 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_LIFESPANSTRATEGYTRANSIENT_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp index c9a01858ca7..c26aad0e420 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp @@ -8,6 +8,8 @@ ACE_RCSID (PortableServer, LifespanStrategyFactoryImpl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -45,7 +47,15 @@ namespace TAO delete strategy; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( LifespanStrategyTransientFactoryImpl, ACE_TEXT ("LifespanStrategyTransientFactory"), diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h index 5cd7ad9483b..d58a823b971 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h @@ -12,6 +12,7 @@ #ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H + #include /**/ "ace/pre.h" #include "portableserver_export.h" @@ -23,6 +24,8 @@ #include "ace/Service_Config.h" #include "LifespanStrategyFactory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -40,11 +43,20 @@ namespace TAO LifespanStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyTransientFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyTransientFactoryImpl) } } #include /**/ "ace/post.h" + #endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/Local_Servant_Base.cpp b/TAO/tao/PortableServer/Local_Servant_Base.cpp index 319d5d22acf..665e0b4fa64 100644 --- a/TAO/tao/PortableServer/Local_Servant_Base.cpp +++ b/TAO/tao/PortableServer/Local_Servant_Base.cpp @@ -11,6 +11,8 @@ ACE_RCSID (PortableServer, # include "Local_Servant_Base.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &, void * @@ -18,3 +20,5 @@ TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &, { ACE_THROW (CORBA::BAD_OPERATION ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Local_Servant_Base.h b/TAO/tao/PortableServer/Local_Servant_Base.h index 6c624d77d01..f97d9836062 100644 --- a/TAO/tao/PortableServer/Local_Servant_Base.h +++ b/TAO/tao/PortableServer/Local_Servant_Base.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,8 @@ #include "tao/PortableServer/Servant_Base.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Local_ServantBase * @@ -39,7 +41,7 @@ class TAO_PortableServer_Export TAO_Local_ServantBase : public virtual TAO_ServantBase { protected: - /// This is an auxiliar method for _this(). Make sure *not* to + /// This is an auxiliary method for _this(). Make sure *not* to /// register with the default POA. TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); @@ -49,6 +51,8 @@ protected: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "Local_Servant_Base.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Local_Servant_Base.inl b/TAO/tao/PortableServer/Local_Servant_Base.inl index 4a426bdaa07..f811de25b9f 100644 --- a/TAO/tao/PortableServer/Local_Servant_Base.inl +++ b/TAO/tao/PortableServer/Local_Servant_Base.inl @@ -1,7 +1,13 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Stub * TAO_Local_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp index c4ac484a1c5..cf784c40081 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp @@ -12,6 +12,8 @@ ACE_RCSID (PortableServer, Non_Servant_Upcall, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -90,3 +92,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.h b/TAO/tao/PortableServer/Non_Servant_Upcall.h index 98f3eec8ec3..e7642f085fb 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.h +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.h @@ -21,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declaration class TAO_Root_POA; class TAO_Object_Adapter; @@ -64,6 +68,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "Non_Servant_Upcall.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.inl b/TAO/tao/PortableServer/Non_Servant_Upcall.inl index 75e0ae843af..0a9b6f2e8de 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.inl +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -14,3 +16,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ORT_Adapter.cpp b/TAO/tao/PortableServer/ORT_Adapter.cpp deleted file mode 100644 index 5c918bb1a4b..00000000000 --- a/TAO/tao/PortableServer/ORT_Adapter.cpp +++ /dev/null @@ -1,9 +0,0 @@ -// $Id$ - -#include "ORT_Adapter.h" -#include "ace/Dynamic_Service.h" - -ACE_RCSID(PortableServer, - ORT_Adapter, - "$Id$") - diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h index 8483a3ee8b3..05d3ae404e8 100644 --- a/TAO/tao/PortableServer/ORT_Adapter.h +++ b/TAO/tao/PortableServer/ORT_Adapter.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -21,10 +21,11 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/SystemException.h" - +#include "tao/PI_ForwardC.h" #include "ace/Service_Object.h" #include "ace/Array_Base.h" -#include "tao/PI_ForwardC.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -110,5 +111,7 @@ namespace TAO } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ORT_ADAPTER_H */ diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp index b64dec61851..2ada7773dc9 100644 --- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp +++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp @@ -1,12 +1,13 @@ // $Id$ #include "ORT_Adapter_Factory.h" -#include "ace/Dynamic_Service.h" ACE_RCSID (PortableServer, ORT_Adapter_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { ORT_Adapter_Factory::~ORT_Adapter_Factory (void) @@ -14,3 +15,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.h b/TAO/tao/PortableServer/ORT_Adapter_Factory.h index 9295cdbed41..0d48ac8f9bf 100644 --- a/TAO/tao/PortableServer/ORT_Adapter_Factory.h +++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -22,8 +22,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { class ORT_Adapter; @@ -64,6 +67,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ORT_ADAPTER_FACTORY_H */ diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index c1a6c27d759..64b092c92a8 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -99,6 +99,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Object_Adapter_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /* static */ CORBA::ULong TAO_Object_Adapter::transient_poa_name_size_ = 0; @@ -1251,3 +1253,4 @@ TAO_Object_Adapter::do_dispatch (TAO_ServerRequest& req, ACE_CHECK; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index 85587c99c0f..b476fe0671b 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -43,6 +43,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Root_POA; class TAO_POA_Manager; class TAO_TSS_Resources; @@ -501,6 +503,8 @@ private: TAO_POA_Policy_Set default_poa_policies_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i index ae4008bcc17..2fe048e9a5e 100644 --- a/TAO/tao/PortableServer/Object_Adapter.i +++ b/TAO/tao/PortableServer/Object_Adapter.i @@ -4,6 +4,8 @@ #include "tao/SystemException.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Policy_Validator & TAO_Object_Adapter::validator (void) { @@ -165,3 +167,4 @@ TAO_Object_Adapter::non_servant_upcall_in_progress (void) const return this->non_servant_upcall_in_progress_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp index 81bc1d4b47b..6f94672dd41 100644 --- a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp +++ b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp @@ -4,9 +4,7 @@ #include "Object_Adapter.h" #include "tao/ORB_Core.h" -TAO_Object_Adapter_Factory::TAO_Object_Adapter_Factory (void) -{ -} +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Adapter* TAO_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) @@ -20,6 +18,8 @@ TAO_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) return adapter; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Object_Adapter_Factory) ACE_STATIC_SVC_DEFINE (TAO_Object_Adapter_Factory, ACE_TEXT ("TAO_Object_Adapter_Factory"), diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.h b/TAO/tao/PortableServer/Object_Adapter_Factory.h index 460fb242519..4cca3ce8ade 100644 --- a/TAO/tao/PortableServer/Object_Adapter_Factory.h +++ b/TAO/tao/PortableServer/Object_Adapter_Factory.h @@ -24,18 +24,20 @@ #include "tao/Adapter_Factory.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_PortableServer_Export TAO_Object_Adapter_Factory : public TAO_Adapter_Factory { public: - /// Constructor - TAO_Object_Adapter_Factory (void); // = The TAO_Adapter_Factory methods, please read tao/Adapter.h for // details. virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_Object_Adapter_Factory) ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Object_Adapter_Factory) diff --git a/TAO/tao/PortableServer/Object_SArg_Traits.h b/TAO/tao/PortableServer/Object_SArg_Traits.h index 1e60217f11d..9f88d1f0970 100644 --- a/TAO/tao/PortableServer/Object_SArg_Traits.h +++ b/TAO/tao/PortableServer/Object_SArg_Traits.h @@ -26,6 +26,8 @@ #include "tao/Pseudo_VarOut_T.h" #include "tao/Any_Insert_Policy_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Object; @@ -51,6 +53,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_OBJECT_SARG_TRAITS_H */ diff --git a/TAO/tao/PortableServer/Object_SArgument_T.cpp b/TAO/tao/PortableServer/Object_SArgument_T.cpp index 2146062474a..598619694c6 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Object_SArgument_T.cpp @@ -9,6 +9,7 @@ #include "tao/PortableServer/Object_SArgument_T.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_ptr, typename S_var, @@ -119,4 +120,6 @@ TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::interceptor_value ( #endif /* TAO_HAS_INTERCEPTORS */ +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_OBJECT_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h index 733beda2955..fd9a6cae8bc 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.h +++ b/TAO/tao/PortableServer/Object_SArgument_T.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // This set of classes is also used by valuetype arguments. If the // specialization is done using S * for the parameter, the semantics // are the same as for interfaces, so there's no need for another @@ -158,6 +160,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/PortableServer/Object_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Object_SArgument_T.inl b/TAO/tao/PortableServer/Object_SArgument_T.inl index a202807a59d..6fcb78ff824 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.inl +++ b/TAO/tao/PortableServer/Object_SArgument_T.inl @@ -3,6 +3,8 @@ // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S_ptr, typename S_var, typename Insert_Policy> @@ -77,3 +79,5 @@ TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) { return this->x_.out (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp index 4d8d3308e46..e79e8a680e5 100644 --- a/TAO/tao/PortableServer/Operation_Table.cpp +++ b/TAO/tao/PortableServer/Operation_Table.cpp @@ -7,6 +7,8 @@ ACE_RCSID(PortableServer, Operation_Table, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // destructor TAO_Operation_Table::~TAO_Operation_Table (void) { @@ -15,8 +17,9 @@ TAO_Operation_Table::~TAO_Operation_Table (void) /**************************************************************/ TAO::Operation_Skeletons::Operation_Skeletons (void) : skel_ptr (0) - , thruPOA_skel_ptr (0) - , direct_skel_ptr (0) + , thruPOA_skel_ptr (0) + , direct_skel_ptr (0) { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h index 2301d7929f6..bd47973d891 100644 --- a/TAO/tao/PortableServer/Operation_Table.h +++ b/TAO/tao/PortableServer/Operation_Table.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -24,6 +24,8 @@ #include "tao/Object.h" #include "tao/Collocation_Strategy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ServerRequest; class TAO_Abstract_ServantBase; @@ -69,6 +71,7 @@ struct TAO_operation_db_entry TAO_Collocated_Skeleton direct_skel_ptr; }; +// -------------------------- namespace TAO { @@ -130,5 +133,7 @@ public: virtual ~TAO_Operation_Table (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_OPTABLE_H */ diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp index 12ff4cf608e..b2dc94486eb 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp @@ -29,10 +29,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ - -TAO_Binary_Search_OpTable::TAO_Binary_Search_OpTable (void) -{ -} +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable (void) { @@ -57,7 +54,6 @@ TAO_Binary_Search_OpTable::find (const char *opname, return 0; } - int TAO_Binary_Search_OpTable::find (const char *opname, TAO_Collocated_Skeleton &skelfunc, @@ -87,8 +83,9 @@ TAO_Binary_Search_OpTable::find (const char *opname, int TAO_Binary_Search_OpTable::bind (const char *, - const TAO::Operation_Skeletons ) + const TAO::Operation_Skeletons) { return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h index 107be238432..be5b661ea64 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -38,8 +38,6 @@ class TAO_PortableServer_Export TAO_Binary_Search_OpTable : public TAO_Operation_Table { public: - /// Do nothing constructor. - TAO_Binary_Search_OpTable (void); /// Do nothing destrctor. virtual ~TAO_Binary_Search_OpTable (void); diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp index feea6d0d7e9..1dc4352b603 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp @@ -29,6 +29,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // constructor TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable ( TAO_operation_db_entry const * db, @@ -128,3 +130,4 @@ TAO_Dynamic_Hash_OpTable::find (const char *opname, return retval; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h index a16c3a3acb3..c30000db011 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -26,6 +26,8 @@ #include "ace/Synch_Traits.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Dynamic_Hash_OpTable * @@ -76,5 +78,7 @@ private: OP_MAP_MANAGER hash_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_OPERATION_TABLE_DYNAMIC_HASH_H */ diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp index 277f0f35269..13b2eb43afb 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp @@ -31,9 +31,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, /***************************************************************/ -TAO_Linear_Search_OpTable::TAO_Linear_Search_OpTable (void) -{ -} +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable (void) { @@ -92,4 +90,4 @@ TAO_Linear_Search_OpTable::find (const char *opname, return 0; } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h index f2055d753d3..a11add3a6c3 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,8 @@ #include "Operation_Table.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Linear_Search_OpTable * @@ -34,8 +36,6 @@ class TAO_PortableServer_Export TAO_Linear_Search_OpTable { public: // = Initialization and termination methods. - /// Default constructor. - TAO_Linear_Search_OpTable (void); /// Destructor. ~TAO_Linear_Search_OpTable (void); @@ -59,5 +59,7 @@ private: virtual const TAO_operation_db_entry* lookup (const char *str) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_OPERATION_TABLE_LINEAR_SEARCH_H */ diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp index ae294a0297a..c214bd97b27 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp @@ -29,10 +29,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ -// Do nothing constructor. -TAO_Perfect_Hash_OpTable::TAO_Perfect_Hash_OpTable (void) -{ -} +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Do nothing destrctor. TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable (void) @@ -103,3 +100,4 @@ TAO_Perfect_Hash_OpTable::bind (const char *, return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h index 5c60c7ad69f..21cf3977859 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,8 @@ #include "Operation_Table.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Perfect_Hash_OpTable * @@ -39,8 +41,6 @@ class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable : public TAO_Operation_Table { public: - /// Do nothing constructor. - TAO_Perfect_Hash_OpTable (void); /// Do nothing destrctor. virtual ~TAO_Perfect_Hash_OpTable (void); @@ -68,6 +68,7 @@ private: unsigned int len) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_OPERATION_TABLE_PERFECT_HASH_H */ diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp index 186b51c9163..3d6d9682827 100644 --- a/TAO/tao/PortableServer/POAManager.cpp +++ b/TAO/tao/PortableServer/POAManager.cpp @@ -15,6 +15,8 @@ ACE_RCSID (PortableServer, POAManager, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_POA_Manager::TAO_POA_Manager (TAO_Object_Adapter &object_adapter) : state_ (PortableServer::POAManager::HOLDING), lock_ (object_adapter.lock ()), @@ -389,3 +391,4 @@ TAO_POA_Manager::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::ORB::_duplicate (this->object_adapter_.orb_core ().orb ()); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h index 59dd117fcdf..014c4a3c77b 100644 --- a/TAO/tao/PortableServer/POAManager.h +++ b/TAO/tao/PortableServer/POAManager.h @@ -30,10 +30,6 @@ #include "tao/PI_ForwardC.h" #include "ace/Unbounded_Set.h" -// Forward decl. -class TAO_Root_POA; -class TAO_Object_Adapter; - // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. #if defined(_MSC_VER) @@ -41,6 +37,13 @@ class TAO_Object_Adapter; #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +// Forward decl. +class TAO_Root_POA; +class TAO_Object_Adapter; + + class TAO_PortableServer_Export TAO_POA_Manager : public PortableServer::POAManager, public TAO_Local_RefCounted_Object @@ -154,6 +157,8 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i index c38b1bd02ef..19adb23dd8f 100644 --- a/TAO/tao/PortableServer/POAManager.i +++ b/TAO/tao/PortableServer/POAManager.i @@ -5,6 +5,7 @@ #include "tao/Environment.h" #include "tao/SystemException.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_Lock & TAO_POA_Manager::lock (void) @@ -127,3 +128,5 @@ TAO_POA_Manager::generate_manager_id (void) const return id; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp index ff0bfe0d32c..931aa81e469 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "POA_Cached_Policies.h" #include "POA_Policy_Set.h" @@ -18,6 +18,8 @@ ACE_RCSID(PortableServer, POA_Cached_Policies, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -160,3 +162,5 @@ namespace TAO } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h index 1c5efabd5d8..73882b29cfc 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.h +++ b/TAO/tao/PortableServer/POA_Cached_Policies.h @@ -30,6 +30,8 @@ #include "ServantRetentionPolicyC.h" #include "RequestProcessingPolicyC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward references. class TAO_POA_Policy_Set; @@ -102,6 +104,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "POA_Cached_Policies.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.i b/TAO/tao/PortableServer/POA_Cached_Policies.i index ab12991fe6e..b3699fe3e7d 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.i +++ b/TAO/tao/PortableServer/POA_Cached_Policies.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -77,3 +81,5 @@ namespace TAO } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp index ccda852f1d1..adca77b77d3 100644 --- a/TAO/tao/PortableServer/POA_Current.cpp +++ b/TAO/tao/PortableServer/POA_Current.cpp @@ -7,14 +7,12 @@ // -- TAO Include -- #include "tao/TSS_Resources.h" -#if !defined (__ACE_INLINE__) -# include "POA_Current.inl" -#endif /* __ACE_INLINE__ */ - ACE_RCSID (PortableServer, POA_Current, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -93,3 +91,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h index 09efa544467..11903c203bf 100644 --- a/TAO/tao/PortableServer/POA_Current.h +++ b/TAO/tao/PortableServer/POA_Current.h @@ -21,27 +21,27 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/LocalObject.h" #include "tao/PortableServer/PS_CurrentC.h" +#include "tao/LocalObject.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server { class POA_Current_Impl; - class TAO_PortableServer_Export POA_Current - : public PortableServer::Current, - public TAO_Local_RefCounted_Object + class POA_Current + : public PortableServer::Current + , public TAO_Local_RefCounted_Object { public: - /// Constructor - POA_Current (void); /** * Returns the POA on which the current request is being invoked. @@ -93,14 +93,12 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ -#if defined (__ACE_INLINE__) -# include "POA_Current.inl" -#endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #endif /* TAO_POA_CURRENT_H */ diff --git a/TAO/tao/PortableServer/POA_Current.inl b/TAO/tao/PortableServer/POA_Current.inl index 4b713846977..3b3b4dadcae 100644 --- a/TAO/tao/PortableServer/POA_Current.inl +++ b/TAO/tao/PortableServer/POA_Current.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -12,3 +14,4 @@ namespace TAO } } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp index b32ba5f91b0..d11c66dce72 100644 --- a/TAO/tao/PortableServer/POA_Current_Factory.cpp +++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp @@ -4,9 +4,7 @@ #include "POA_Current.h" #include "tao/ORB_Core.h" -TAO_POA_Current_Factory::TAO_POA_Current_Factory (void) -{ -} +TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Object_ptr TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr, @@ -22,6 +20,8 @@ TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr, return adapter; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_POA_Current_Factory) ACE_STATIC_SVC_DEFINE (TAO_POA_Current_Factory, ACE_TEXT ("TAO_POA_Current_Factory"), diff --git a/TAO/tao/PortableServer/POA_Current_Factory.h b/TAO/tao/PortableServer/POA_Current_Factory.h index c7cbb6d2e2a..36261898c94 100644 --- a/TAO/tao/PortableServer/POA_Current_Factory.h +++ b/TAO/tao/PortableServer/POA_Current_Factory.h @@ -24,12 +24,12 @@ #include "tao/Object_Loader.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_PortableServer_Export TAO_POA_Current_Factory : public TAO_Object_Loader { public: - /// Constructor - TAO_POA_Current_Factory (void); /// Creates a PICurrent and returns it. virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, @@ -39,6 +39,8 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_POA_Current_Factory) ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_POA_Current_Factory) diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp index 781a061c4e3..32ec63aa6db 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.cpp +++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp @@ -15,6 +15,8 @@ ACE_RCSID (PortableServer, POA_Current_IMpl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -105,3 +107,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Current_Impl.h b/TAO/tao/PortableServer/POA_Current_Impl.h index 0f7ed6020bc..1dcedf72350 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.h +++ b/TAO/tao/PortableServer/POA_Current_Impl.h @@ -23,6 +23,8 @@ #include "PS_ForwardC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -57,7 +59,7 @@ namespace TAO * execution thread so that the proper <TAO_POA_Current> pointer * is obtained from TSS. */ - class TAO_PortableServer_Export POA_Current_Impl + class POA_Current_Impl { public: friend class ::TAO_Root_POA; @@ -134,6 +136,12 @@ namespace TAO void setup (::TAO_Root_POA *impl, const TAO::ObjectKey &key); + private: + + // = Hidden because we don't allow these + POA_Current_Impl (const POA_Current_Impl &); + void operator= (const POA_Current_Impl &); + protected: /// The POA implementation invoking an upcall ::TAO_Root_POA *poa_; @@ -163,13 +171,12 @@ namespace TAO /// Pointer to tss resources. TAO_TSS_Resources *tss_resources_; - // = Hidden because we don't allow these - POA_Current_Impl (const POA_Current_Impl &); - void operator= (const POA_Current_Impl &); }; } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "POA_Current_Impl.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/POA_Current_Impl.inl b/TAO/tao/PortableServer/POA_Current_Impl.inl index 350d1cf820b..db220558ae6 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.inl +++ b/TAO/tao/PortableServer/POA_Current_Impl.inl @@ -4,6 +4,8 @@ #include "tao/SystemException.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -81,3 +83,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp index cbf2eb0bba7..86740ada622 100644 --- a/TAO/tao/PortableServer/POA_Guard.cpp +++ b/TAO/tao/PortableServer/POA_Guard.cpp @@ -8,6 +8,9 @@ ACE_RCSID(PortableServer, POA_Guard, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -43,3 +46,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h index a7347130783..0f07265bff2 100644 --- a/TAO/tao/PortableServer/POA_Guard.h +++ b/TAO/tao/PortableServer/POA_Guard.h @@ -1,16 +1,16 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** * @file POA_Guard.h * * $Id$ - * */ //============================================================================= #ifndef TAO_POA_GUARD_H #define TAO_POA_GUARD_H + #include /**/ "ace/pre.h" #include "portableserver_export.h" @@ -19,9 +19,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Environment.h" #include "ace/Guard_T.h" #include "ace/CORBA_macros.h" -#include "tao/Environment.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Root_POA; @@ -49,5 +51,8 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" + #endif /* TAO_POA_GUARD_H */ diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp index e0ee81f34e2..644c9511756 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.cpp +++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp @@ -15,9 +15,10 @@ ACE_RCSID (PortableServer, POA_Policy_Set, "$Id$") -TAO_POA_Policy_Set::TAO_POA_Policy_Set () - : - impl_ (TAO_POLICY_POA_SCOPE) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_POA_Policy_Set::TAO_POA_Policy_Set (void) + : impl_ (TAO_POLICY_POA_SCOPE) { } @@ -89,3 +90,5 @@ TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator, } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h index 46fc0f4b5b7..92c9dfc6c60 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.h +++ b/TAO/tao/PortableServer/POA_Policy_Set.h @@ -6,8 +6,7 @@ * * $Id$ * - * POA - * + * POA * * @author Irfan Pyarali */ @@ -25,13 +24,15 @@ #include "tao/Policy_Set.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Policy_Validator; class TAO_PortableServer_Export TAO_POA_Policy_Set { public: - TAO_POA_Policy_Set (); + TAO_POA_Policy_Set (void); TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs); @@ -72,6 +73,8 @@ protected: TAO_Policy_Set impl_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "POA_Policy_Set.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/POA_Policy_Set.i b/TAO/tao/PortableServer/POA_Policy_Set.i index fee42969600..4181baecf48 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.i +++ b/TAO/tao/PortableServer/POA_Policy_Set.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::ULong TAO_POA_Policy_Set::num_policies (void) const { @@ -51,3 +55,5 @@ TAO_POA_Policy_Set::policies (void) { return this->impl_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h index 9498924469a..d0854a95849 100644 --- a/TAO/tao/PortableServer/Policy_Strategy.h +++ b/TAO/tao/PortableServer/Policy_Strategy.h @@ -14,14 +14,16 @@ #define TAO_POLICY_STRATEGY_H #include /**/ "ace/pre.h" -#include "ace/Service_Object.h" +#include "tao/Environment.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Service_Object.h" #include "ace/CORBA_macros.h" -#include "tao/Environment.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Root_POA; @@ -42,5 +44,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_POLICY_STRATEGY_H */ diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp index 2517081b640..087507b9371 100644 --- a/TAO/tao/PortableServer/PortableServer.cpp +++ b/TAO/tao/PortableServer/PortableServer.cpp @@ -46,6 +46,9 @@ ACE_RCSID (PortableServer, PortableServer, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_POA_Initializer::init (void) { @@ -170,3 +173,5 @@ TAO_POA_Initializer::init (void) ace_svc_desc_TAO_Object_Adapter_Factory ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h index b5d9c773bdf..b8416d2500f 100644 --- a/TAO/tao/PortableServer/PortableServer.h +++ b/TAO/tao/PortableServer/PortableServer.h @@ -21,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_PortableServer_Export TAO_POA_Initializer { public: @@ -31,6 +35,8 @@ public: static int TAO_Requires_POA_Initializer = TAO_POA_Initializer::init (); +TAO_END_VERSIONED_NAMESPACE_DECL + #define TAO_PORTABLESERVER_SAFE_INCLUDE #include "PortableServerC.h" #undef TAO_PORTABLESERVER_SAFE_INCLUDE diff --git a/TAO/tao/PortableServer/PortableServer_Functions.cpp b/TAO/tao/PortableServer/PortableServer_Functions.cpp index 23fb82cb0fd..202bc93d2fb 100644 --- a/TAO/tao/PortableServer/PortableServer_Functions.cpp +++ b/TAO/tao/PortableServer/PortableServer_Functions.cpp @@ -6,6 +6,8 @@ ACE_RCSID (PortableServer, #include "ace/OS_NS_string.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { PortableServer::ObjectId * @@ -54,3 +56,5 @@ namespace PortableServer } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PortableServer_Functions.h b/TAO/tao/PortableServer/PortableServer_Functions.h index e5de24e99f7..2ee4454a50d 100644 --- a/TAO/tao/PortableServer/PortableServer_Functions.h +++ b/TAO/tao/PortableServer/PortableServer_Functions.h @@ -40,6 +40,8 @@ #include "tao/PortableServer/PS_ForwardC.h" #include "ace/OS_NS_wchar.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { /// Utility functions for the other @@ -50,6 +52,8 @@ namespace PortableServer const char *id); } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_FUNCTIONS_H */ diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp index fcd1dbc3fa4..6fa055e9ad2 100644 --- a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp +++ b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp @@ -6,6 +6,8 @@ ACE_RCSID (PortableServer, #include "ace/OS_NS_string.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { PortableServer::ObjectId * @@ -66,3 +68,4 @@ namespace PortableServer } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.h b/TAO/tao/PortableServer/PortableServer_WFunctions.h index b020106a939..5dd938ed99b 100644 --- a/TAO/tao/PortableServer/PortableServer_WFunctions.h +++ b/TAO/tao/PortableServer/PortableServer_WFunctions.h @@ -40,6 +40,8 @@ #include "tao/PortableServer/PS_ForwardC.h" #include "ace/OS_NS_wchar.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar* ObjectId_to_wstring ( @@ -49,6 +51,8 @@ namespace PortableServer const CORBA::WChar *id); } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_WFUNCTIONS_H */ diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp index 1b8045b030d..5d9516a1f42 100644 --- a/TAO/tao/PortableServer/Regular_POA.cpp +++ b/TAO/tao/PortableServer/Regular_POA.cpp @@ -9,6 +9,8 @@ ACE_RCSID (PortableServer, # include "Regular_POA.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name, TAO_POA_Manager &poa_manager, const TAO_POA_Policy_Set &policies, @@ -67,3 +69,5 @@ TAO_Regular_POA::root_key_type (void) return TAO_Root_POA::root_key_type (); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h index 516fa3b6f68..c03f8d3804a 100644 --- a/TAO/tao/PortableServer/Regular_POA.h +++ b/TAO/tao/PortableServer/Regular_POA.h @@ -25,6 +25,8 @@ #include "tao/PortableServer/Root_POA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Regular_POA * @@ -64,6 +66,7 @@ protected: TAO_Root_POA *parent_; }; +TAO_END_VERSIONED_NAMESPACE_DECL // **************************************************************** diff --git a/TAO/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl index fa533b4991e..04b4b4b091b 100644 --- a/TAO/tao/PortableServer/Regular_POA.inl +++ b/TAO/tao/PortableServer/Regular_POA.inl @@ -2,13 +2,13 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE PortableServer::POA_ptr TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - if (this->parent_ != 0) - return PortableServer::POA::_duplicate (this->parent_); - else - return PortableServer::POA::_nil (); + return PortableServer::POA::_duplicate (this->parent_); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp index ca76ad11887..007a080e115 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp @@ -7,6 +7,8 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -66,4 +68,6 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h index 6e9b9703085..63518a04663 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h @@ -32,6 +32,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -67,6 +69,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if defined(_MSC_VER) diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp index e0874c451eb..01b71f00396 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp @@ -5,7 +5,6 @@ * @file RequestProcessingStrategy.cpp * * $Id$ - * */ //============================================================================= @@ -15,11 +14,14 @@ ACE_RCSID (PortableServer, RequestProcessingStrategy, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server { - RequestProcessingStrategy::RequestProcessingStrategy() + RequestProcessingStrategy::RequestProcessingStrategy (void) : poa_ (0) { } @@ -56,3 +58,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h index c6029211f5f..0a1089daf46 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h @@ -23,6 +23,8 @@ #include "PortableServer.h" #include "Servant_Location.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { class ServantManager; @@ -137,5 +139,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_REQUEST_PROCESSING_STRATEGY_H */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp index b77993ba572..ce65fe59834 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp @@ -11,6 +11,8 @@ ACE_RCSID (PortableServer, Request_Processing, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -180,3 +182,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h index f98b135f3ac..58b4699cdb0 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h @@ -23,6 +23,8 @@ #include "Servant_Location.h" #include "PortableServer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -108,5 +110,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_REQUESTPROCESSINGSTRATEGYAOMONLY_H */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp index 53a356fbf32..de31c4ad23d 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp @@ -9,6 +9,8 @@ ACE_RCSID (PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -47,7 +49,15 @@ namespace TAO delete strategy; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyAOMOnlyFactoryImpl, ACE_TEXT ("RequestProcessingStrategyAOMOnlyFactory"), diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h index 81e10c20474..1a2464215e5 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h @@ -23,6 +23,8 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/RequestProcessingStrategyFactory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -40,7 +42,15 @@ namespace TAO RequestProcessingStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl) } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index 1d5954cd800..9e2c8e25075 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -15,6 +15,8 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -280,5 +282,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h index dcb5232e54e..a420a29d376 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h @@ -27,6 +27,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Root_POA; namespace TAO @@ -113,6 +115,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp index ea8c1b03a3d..957619b426c 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp @@ -11,6 +11,8 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -49,7 +51,15 @@ namespace TAO delete strategy; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyDefaultServantFactoryImpl, ACE_TEXT ("RequestProcessingStrategyDefaultServantFactory"), diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h index b02aba40dc3..3c9dc3dcfc9 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h @@ -25,6 +25,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -42,7 +44,15 @@ namespace TAO RequestProcessingStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl) } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h index 157321b4152..2f629ba6820 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h @@ -24,6 +24,8 @@ #include "tao/PortableServer/RequestProcessingPolicyC.h" #include "tao/PortableServer/ServantRetentionPolicyC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -46,5 +48,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp index 8582dd19f01..0e75f079b92 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp @@ -11,6 +11,8 @@ ACE_RCSID (PortableServer, RequestProcessingStrategyFactoryImpl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -128,7 +130,15 @@ namespace TAO ACE_CHECK; } } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyFactoryImpl, ACE_TEXT ("RequestProcessingStrategyFactory"), diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h index 007659174cd..dd86d6631b8 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h @@ -23,6 +23,8 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/RequestProcessingStrategyFactory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -39,7 +41,15 @@ namespace TAO RequestProcessingStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyFactoryImpl) } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index c1ffab9927d..93285339861 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -14,6 +14,8 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -348,4 +350,6 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h index 8130b9eb8c0..8e2f590d91a 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h @@ -25,6 +25,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { class ServantActivator; @@ -95,6 +97,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp index 766fb256043..328677b3106 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp @@ -12,6 +12,8 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -62,7 +64,15 @@ namespace TAO delete strategy; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyServantActivatorFactoryImpl, ACE_TEXT ("RequestProcessingStrategyServantActivatorFactory"), diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h index cdc19cff125..d49e034df60 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h @@ -25,6 +25,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -42,7 +44,15 @@ namespace TAO RequestProcessingStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl) } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index 47beac46acc..bb97bac6610 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -1,5 +1,3 @@ -// -*- C++ -*- - #include "tao/ORB_Constants.h" #include "ServantLocatorC.h" #include "RequestProcessingStrategyServantLocator.h" @@ -15,6 +13,8 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -253,5 +253,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h index 103ccba19fc..ff235125578 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h @@ -25,6 +25,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { class ServantLocator; @@ -86,6 +88,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp index bf962eaf46c..613402f93d5 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp @@ -12,6 +12,8 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -62,7 +64,15 @@ namespace TAO delete strategy; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyServantLocatorFactoryImpl, ACE_TEXT ("RequestProcessingStrategyServantLocatorFactory"), diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h index 795a7b9d5b6..1c920bc0351 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h @@ -25,6 +25,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -42,7 +44,15 @@ namespace TAO RequestProcessingStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl) } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp index af78da4ca83..414b7356150 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp @@ -11,6 +11,8 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -94,5 +96,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h index f68cc5d887d..2957150440b 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h @@ -25,6 +25,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -70,6 +72,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 68e49420e34..9fe19884ee3 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -62,6 +62,8 @@ ACE_RCSID (PortableServer, POA, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // This is the TAO_Object_key-prefix that is appended to all TAO Object keys. // It's an array of octets representing ^t^a^o/0 in octal. CORBA::Octet const @@ -2899,13 +2901,11 @@ TAO_POA_Static_Resources::TAO_POA_Static_Resources (void) void TAO_Root_POA::poa_activated_hook () { - //no-ops } void TAO_Root_POA::poa_deactivated_hook () { - //no-ops } void @@ -2913,7 +2913,6 @@ TAO_Root_POA::servant_activated_hook (PortableServer::Servant, const PortableServer::ObjectId& ACE_ENV_ARG_DECL) { - //no-ops } void @@ -2921,6 +2920,6 @@ TAO_Root_POA::servant_deactivated_hook (PortableServer::Servant, const PortableServer::ObjectId& ACE_ENV_ARG_DECL) { - //no-ops } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index 313bd5bb093..419a9b455a8 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -23,14 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/SString.h" -#include "ace/Hash_Map_Manager_T.h" -#include "ace/Array_Base.h" -#include "ace/Synch_Traits.h" -#include "ace/Thread_Mutex.h" -#include "ace/Recursive_Thread_Mutex.h" -#include "ace/Null_Mutex.h" - // Object Adapter #include "Object_Adapter.h" @@ -57,6 +49,14 @@ // OctetSeq #include "tao/OctetSeqC.h" +#include "ace/SString.h" +#include "ace/Hash_Map_Manager_T.h" +#include "ace/Array_Base.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" +#include "ace/Recursive_Thread_Mutex.h" +#include "ace/Null_Mutex.h" + // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. #if defined(_MSC_VER) @@ -64,6 +64,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward Declaration class TAO_Acceptor_Filter; class TAO_Acceptor_Registry; @@ -1008,6 +1010,8 @@ private: static TAO_POA_Static_Resources* initialization_reference_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** #if defined(_MSC_VER) diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl index fa9ba6014e4..116d1d99c4f 100644 --- a/TAO/tao/PortableServer/Root_POA.inl +++ b/TAO/tao/PortableServer/Root_POA.inl @@ -5,6 +5,8 @@ // Exception macros #include "tao/Environment.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Boolean TAO_Root_POA::cleanup_in_progress (void) { @@ -240,3 +242,5 @@ TAO_Root_POA::servant_deactivation_condition (void) { return servant_deactivation_condition_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/SArg_Traits_T.h b/TAO/tao/PortableServer/SArg_Traits_T.h index 4287b2d2765..09f01b6bef4 100644 --- a/TAO/tao/PortableServer/SArg_Traits_T.h +++ b/TAO/tao/PortableServer/SArg_Traits_T.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -6,11 +6,11 @@ * * $Id$ * - * @authors Jeff Parsons and Carlos O'Ryan + * @author Jeff Parsons + * @author Carlos O'Ryan */ //============================================================================= - #ifndef TAO_SARG_TRAITS_T_H #define TAO_SARG_TRAITS_T_H @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -33,6 +35,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SARG_TRAITS_T_H */ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp index 9ae6180bbb2..a9c2b76c2eb 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp @@ -7,6 +7,8 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -40,7 +42,7 @@ namespace TAO ServantRetentionPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - return value_; + return this->value_; } CORBA::PolicyType @@ -64,4 +66,6 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h index 9495d660701..ce43683223e 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h @@ -32,6 +32,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -67,6 +69,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if defined(_MSC_VER) diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h index 83529bc8cb8..67bcb2e8284 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategy.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h @@ -25,6 +25,8 @@ #include "ServantRetentionPolicyC.h" #include "PortableServer.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Root_POA; class TAO_Active_Object_Map; struct TAO_Active_Object_Map_Entry; @@ -151,5 +153,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SERVANTRETENTIONSTRATEGY_H */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp index 1e4d947f999..cc551ea7c34 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp @@ -9,6 +9,8 @@ ACE_RCSID (PortableServer, ServantRetentionStrategyFactoryImpl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -75,7 +77,15 @@ namespace TAO ACE_CHECK; } } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( ServantRetentionStrategyFactoryImpl, ACE_TEXT ("ServantRetentionStrategyFactory"), diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h index 637569c1c87..741f5c0d32f 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h @@ -23,6 +23,8 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/ServantRetentionStrategyFactory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -39,7 +41,15 @@ namespace TAO ServantRetentionStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyFactoryImpl) } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index fb1cce33769..974781248e4 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -21,6 +21,8 @@ ACE_RCSID (PortableServer, Servant_Retention_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -331,3 +333,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index 0cc33443c9a..3b3b5a15a32 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -22,6 +22,8 @@ #include "Servant_Location.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Root_POA; namespace TAO @@ -158,5 +160,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp index 8703ddb53f6..b957d11ca4a 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp @@ -12,6 +12,8 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -49,7 +51,15 @@ namespace TAO delete strategy; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( ServantRetentionStrategyNonRetainFactoryImpl, ACE_TEXT ("ServantRetentionStrategyNonRetainFactory"), diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h index 04594be87f6..165f65dbfb8 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h @@ -25,6 +25,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -41,7 +43,15 @@ namespace TAO ServantRetentionStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl) } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index 3e054666f24..003a4a57b64 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -24,6 +24,8 @@ ACE_RCSID (PortableServer, Servant_Retention_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -1050,3 +1052,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 789604bbb9b..52184d1b630 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Root_POA; namespace TAO @@ -181,5 +183,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SERVANT_RETENTION_STRATEGY_RETAIN_H */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp index 476ea401ebf..0e14047a6af 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp @@ -10,6 +10,8 @@ ACE_RCSID (PortableServer, ServantRetentionStrategyRetainFactoryImpl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -47,7 +49,15 @@ namespace TAO delete strategy; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( ServantRetentionStrategyRetainFactoryImpl, ACE_TEXT ("ServantRetentionStrategyRetainFactory"), diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h index 9fd7a80ee08..9b4d6b12860 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h @@ -23,6 +23,8 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/ServantRetentionStrategyFactory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -39,7 +41,15 @@ namespace TAO ServantRetentionStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl) } diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 170196e7695..af33f3010c2 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -46,6 +46,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Servant_Base_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ServantBase::TAO_ServantBase (void) : TAO_Abstract_ServantBase () , ref_count_ (1) @@ -477,3 +479,4 @@ TAO_ServantBase_var::_retn (void) return retval; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 6156e5eb7dc..5e1f1e4a88a 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -25,6 +25,8 @@ #include "tao/Abstract_Servant_Base.h" #include "ace/Atomic_Op.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Operation_Table; /** @@ -217,6 +219,8 @@ private: TAO_ServantBase *ptr_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "Servant_Base.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Servant_Base.i b/TAO/tao/PortableServer/Servant_Base.i index a0f38b795a9..a975c809e62 100644 --- a/TAO/tao/PortableServer/Servant_Base.i +++ b/TAO/tao/PortableServer/Servant_Base.i @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ServantBase_var::TAO_ServantBase_var (void) @@ -41,3 +42,4 @@ TAO_Servant_Hash::operator () (PortableServer::Servant servant) const return static_cast<u_long> (reinterpret_cast<ptrdiff_t> (servant)); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Servant_Dispatcher.cpp index f90cb97c96a..abe28052f0c 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Servant_Dispatcher.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "Servant_Dispatcher.h" @@ -6,6 +6,9 @@ ACE_RCSID(PortableServer, Servant_Dispatcher, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher (void) { } diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h index a71b949d84e..4ba8c3c4200 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Servant_Dispatcher.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -20,14 +20,17 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/SStringfwd.h" #include "Servant_Upcall.h" +#include "ace/SStringfwd.h" + +class ACE_Lock; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward references. class TAO_POA_Manager; class TAO_POA_Policy_Set; class TAO_Root_POA; -class ACE_Lock; class TAO_ORB_Core; class TAO_ServerRequest; @@ -74,5 +77,7 @@ public: ACE_ENV_ARG_DECL) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SERVANT_DISPATCHER_H */ diff --git a/TAO/tao/PortableServer/Servant_Location.h b/TAO/tao/PortableServer/Servant_Location.h index 2e533e63a6b..fa60ac9cf43 100644 --- a/TAO/tao/PortableServer/Servant_Location.h +++ b/TAO/tao/PortableServer/Servant_Location.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + enum TAO_SERVANT_LOCATION { TAO_SERVANT_FOUND, @@ -29,6 +31,8 @@ enum TAO_SERVANT_LOCATION TAO_SERVANT_NOT_FOUND }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SERVANT_LOCATION_H */ diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index 5529135be6c..1388583a710 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -23,6 +23,8 @@ ACE_RCSID (PortableServer, Servant_Upcall, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -468,3 +470,5 @@ namespace TAO } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h index b9564e8d7a8..b64555547e1 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.h +++ b/TAO/tao/PortableServer/Servant_Upcall.h @@ -28,6 +28,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declaration class TAO_Root_POA; class TAO_ServerRequest; @@ -232,6 +234,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/Servant_Upcall.inl b/TAO/tao/PortableServer/Servant_Upcall.inl index 36c4739f457..5f016db3fe6 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.inl +++ b/TAO/tao/PortableServer/Servant_Upcall.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -103,3 +105,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp index 991f39a5bab..f15942d5e54 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp @@ -12,6 +12,8 @@ // ============================================================ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S, typename to_S, typename from_S, @@ -138,4 +140,6 @@ interceptor_value (CORBA::Any *any) const #endif /* TAO_HAS_INTERCEPTORS */ +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_SPECIAL_BASIC_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h index e7d34f8494b..bb240a0a03f 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h @@ -22,6 +22,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -155,6 +158,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/PortableServer/Special_Basic_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl index 38d18635683..6c3d9685b54 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S, typename to_S, typename from_S, @@ -91,3 +93,4 @@ TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) return this->x_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Special_Basic_SArguments.h b/TAO/tao/PortableServer/Special_Basic_SArguments.h index 29708781603..f306336fe83 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArguments.h +++ b/TAO/tao/PortableServer/Special_Basic_SArguments.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -6,7 +6,8 @@ * * $Id$ * - * @authors Jeff Parsons and Carlos O'Ryan + * @author Jeff Parsons + * @author Carlos O'Ryan */ //============================================================================= @@ -27,6 +28,7 @@ #include "ace/CDR_Stream.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -74,6 +76,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SPECIAL_BASIC_SARGUMENTS_H */ diff --git a/TAO/tao/PortableServer/StrategyFactory.cpp b/TAO/tao/PortableServer/StrategyFactory.cpp index 98331b770b4..84528d7cbf2 100644 --- a/TAO/tao/PortableServer/StrategyFactory.cpp +++ b/TAO/tao/PortableServer/StrategyFactory.cpp @@ -7,6 +7,8 @@ ACE_RCSID (PortableServer, StrategyFactory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -16,3 +18,5 @@ namespace TAO } } /* namespace Portable_Server */ } /* namespace TAO */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/StrategyFactory.h b/TAO/tao/PortableServer/StrategyFactory.h index 54546f1f946..16b1314c72e 100644 --- a/TAO/tao/PortableServer/StrategyFactory.h +++ b/TAO/tao/PortableServer/StrategyFactory.h @@ -1,4 +1,5 @@ // -*- C++ -*- + //============================================================================= /** * @file StrategyFactory.h @@ -11,6 +12,7 @@ #ifndef TAO_PORTABLESERVER_STRATEGYFACTORY_H #define TAO_PORTABLESERVER_STRATEGYFACTORY_H + #include /**/ "ace/pre.h" #include "ace/Service_Object.h" @@ -19,12 +21,16 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server { - class StrategyFactory : - public ACE_Service_Object + class StrategyFactory + : public ACE_Service_Object { public: virtual ~StrategyFactory (void); @@ -32,5 +38,8 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" + #endif /* TAO_PORTABLESERVER_STRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp index a314bcb436d..2accc26ac96 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.cpp +++ b/TAO/tao/PortableServer/ThreadPolicy.cpp @@ -7,6 +7,8 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -63,4 +65,6 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h index dc9673f59a7..da85150149f 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.h +++ b/TAO/tao/PortableServer/ThreadPolicy.h @@ -32,6 +32,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -67,6 +69,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if defined(_MSC_VER) diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp index 6f1d80b5c36..58b9810f1c6 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.cpp +++ b/TAO/tao/PortableServer/ThreadStrategy.cpp @@ -6,12 +6,15 @@ ACE_RCSID (PortableServer, ThreadStrategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server { void - ThreadStrategy::strategy_init (TAO_Root_POA * /*poa*/ ACE_ENV_ARG_DECL_NOT_USED) + ThreadStrategy::strategy_init (TAO_Root_POA * /*poa*/ + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -22,3 +25,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h index fe992cb580e..ff9ae795df4 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.h +++ b/TAO/tao/PortableServer/ThreadStrategy.h @@ -23,12 +23,14 @@ #include "ThreadPolicyC.h" #include "tao/orbconf.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server { - class ThreadStrategy : - public Policy_Strategy + class ThreadStrategy + : public Policy_Strategy { public: virtual int enter () = 0; @@ -44,5 +46,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_THREAD_STRATEGY_H */ diff --git a/TAO/tao/PortableServer/ThreadStrategyFactory.h b/TAO/tao/PortableServer/ThreadStrategyFactory.h index 5dea79f8b41..3f8590e1dc4 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactory.h +++ b/TAO/tao/PortableServer/ThreadStrategyFactory.h @@ -12,6 +12,7 @@ #ifndef TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H #define TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H + #include /**/ "ace/pre.h" #include "StrategyFactory.h" @@ -22,6 +23,8 @@ #include "ThreadPolicyC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -44,5 +47,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" + #endif /* TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp index b12fb95bb29..de9280d7b6a 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp @@ -9,6 +9,8 @@ ACE_RCSID (PortableServer, ThreadStrategyFactoryImpl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -80,7 +82,15 @@ namespace TAO } } } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( ThreadStrategyFactoryImpl, ACE_TEXT ("ThreadStrategyFactory"), diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h index 9ffb364e529..f2d4040f58c 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h @@ -23,6 +23,8 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/ThreadStrategyFactory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -39,7 +41,15 @@ namespace TAO ThreadStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyFactoryImpl) } diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp index abec20789c5..136d88e2ba8 100644 --- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp @@ -7,6 +7,8 @@ ACE_RCSID (PortableServer, ThreadStrategyORBControl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -28,7 +30,16 @@ namespace TAO { return ::PortableServer::ORB_CTRL_MODEL; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategyORBControl) ACE_STATIC_SVC_DEFINE ( diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.h b/TAO/tao/PortableServer/ThreadStrategyORBControl.h index c0f4ff5cd8f..133f0fc6955 100644 --- a/TAO/tao/PortableServer/ThreadStrategyORBControl.h +++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.h @@ -12,6 +12,7 @@ #ifndef TAO_THREADSTRATEGYORBCONTROL_H #define TAO_THREADSTRATEGYORBCONTROL_H + #include /**/ "ace/pre.h" #include "portableserver_export.h" @@ -21,8 +22,10 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ThreadStrategy.h" -#include "ace/Service_Config.h" #include "tao/orbconf.h" +#include "ace/Service_Config.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -38,11 +41,20 @@ namespace TAO virtual ::PortableServer::ThreadPolicyValue type() const; }; + } +} +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyORBControl) ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyORBControl) } } #include /**/ "ace/post.h" + #endif /* TAO_THREADSTRATEGYORBCONTROL_H */ diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp index 0212e5a092e..a0d79ef70fe 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp @@ -10,6 +10,8 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -31,7 +33,15 @@ namespace TAO { return ::PortableServer::SINGLE_THREAD_MODEL; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategySingle) ACE_STATIC_SVC_DEFINE ( diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h index b10a56f0bb4..8f251f4322d 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.h +++ b/TAO/tao/PortableServer/ThreadStrategySingle.h @@ -21,6 +21,9 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ThreadStrategy.h" + +#include "tao/orbconf.h" + #include "ace/Service_Config.h" // Locking @@ -29,10 +32,11 @@ #include "ace/Recursive_Thread_Mutex.h" #include "ace/Null_Mutex.h" -#include "tao/orbconf.h" #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -49,7 +53,15 @@ namespace TAO private: TAO_SYNCH_RECURSIVE_MUTEX lock_; }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingle) ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingle) } diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp index e5df89cc177..3e305e79446 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp @@ -12,6 +12,8 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -49,7 +51,15 @@ namespace TAO delete strategy; } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DEFINE ( ThreadStrategySingleFactoryImpl, ACE_TEXT ("ThreadStrategySingleFactory"), diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h index 260ea7cf4bc..58617bbce32 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h @@ -25,6 +25,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Portable_Server @@ -41,7 +43,15 @@ namespace TAO ThreadStrategy *strategy ACE_ENV_ARG_DECL); }; + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace Portable_Server + { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingleFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingleFactoryImpl) } diff --git a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h index 0314b900e76..2e0f067d2fd 100644 --- a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h +++ b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h @@ -24,6 +24,7 @@ #include "tao/PortableServer/Object_SArgument_T.h" #include "tao/Pseudo_VarOut_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -55,6 +56,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_TYPECODE_SARG_TRAITS_H */ diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp index c5d7730469f..7f8db0408f5 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp @@ -9,6 +9,7 @@ #include "tao/PortableServer/UB_String_SArgument_T.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename S_var> CORBA::Boolean @@ -99,4 +100,6 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_value ( #endif /* TAO_HAS_INTERCEPTORS */ +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_UB_STRING_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h index 3d681d3e0d9..ac1202a2d4f 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.h +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -141,6 +143,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/PortableServer/UB_String_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.inl b/TAO/tao/PortableServer/UB_String_SArgument_T.inl index daf8637012c..b60809e056d 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.inl +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename S, typename S_var> ACE_INLINE TAO::In_UB_String_SArgument_T<S,S_var>::In_UB_String_SArgument_T (void) @@ -58,3 +62,4 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::arg (void) return this->x_.out (); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/UB_String_SArguments.h b/TAO/tao/PortableServer/UB_String_SArguments.h index fd3440e5804..e86e7c0ae24 100644 --- a/TAO/tao/PortableServer/UB_String_SArguments.h +++ b/TAO/tao/PortableServer/UB_String_SArguments.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -6,7 +6,8 @@ * * $Id$ * - * @authors Jeff Parsons and Carlos O'Ryan + * @author Jeff Parsons + * @author Carlos O'Ryan */ //============================================================================= @@ -24,6 +25,8 @@ #include "tao/PortableServer/UB_String_SArgument_T.h" #include "tao/PortableServer/SArg_Traits_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -49,6 +52,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_UB_STRING_SARGUMENTS_H */ diff --git a/TAO/tao/PortableServer/Upcall_Command.cpp b/TAO/tao/PortableServer/Upcall_Command.cpp index ebfa73dac9b..15e80841752 100644 --- a/TAO/tao/PortableServer/Upcall_Command.cpp +++ b/TAO/tao/PortableServer/Upcall_Command.cpp @@ -8,6 +8,10 @@ ACE_RCSID (PortableServer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::Upcall_Command::~Upcall_Command (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h index 700ad64090c..40c216457f7 100644 --- a/TAO/tao/PortableServer/Upcall_Command.h +++ b/TAO/tao/PortableServer/Upcall_Command.h @@ -16,12 +16,15 @@ #include /**/ "ace/pre.h" #include "tao/PortableServer/portableserver_export.h" -#include "ace/CORBA_macros.h" #ifndef ACE_LACKS_PRAGMA_ONCE # pragma once #endif /* !ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" +#include "ace/CORBA_macros.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -57,6 +60,7 @@ namespace TAO } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp index dde1cedfad6..76e668873bc 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp @@ -20,6 +20,7 @@ ACE_RCSID (PortableServer, Upcall_Wrapper, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, @@ -266,3 +267,5 @@ TAO::Upcall_Wrapper::post_upcall (TAO_OutputCDR & cdr, } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h index c6d62419310..3d3b02f2a0d 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Upcall_Wrapper.h @@ -28,6 +28,8 @@ #include "ace/CORBA_macros.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ServantBase; class TAO_ServerRequest; class TAO_InputCDR; @@ -122,6 +124,7 @@ namespace TAO } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp index b7009ed3baa..06a9e5014a4 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp @@ -9,6 +9,7 @@ #include "tao/PortableServer/Var_Array_SArgument_T.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename S_slice, @@ -160,4 +161,6 @@ TAO::Ret_Var_Array_SArgument_T<S_slice, #endif /* TAO_HAS_INTERCEPTORS */ +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_VAR_ARRAY_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h index ab4418314e6..db7835de063 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -171,6 +173,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "tao/PortableServer/Var_Array_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl index 30674cca189..bbc5dd80950 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename S_slice, @@ -115,3 +116,4 @@ TAO::Ret_Var_Array_SArgument_T<S_slice, return this->x_.out (); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/get_arg.h b/TAO/tao/PortableServer/get_arg.h index 498035b3ed8..38c21f200c9 100644 --- a/TAO/tao/PortableServer/get_arg.h +++ b/TAO/tao/PortableServer/get_arg.h @@ -31,6 +31,7 @@ #include "tao/operation_details.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -135,6 +136,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_GET_ARG_H*/ diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h index ca9e01b11d8..4ef9552bfd4 100644 --- a/TAO/tao/PortableServer/poa_macros.h +++ b/TAO/tao/PortableServer/poa_macros.h @@ -1,10 +1,14 @@ +// -*- C++ -*- + // $Id$ #ifndef TAO_POA_MACROS_H #define TAO_POA_MACROS_H + #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" + #include "tao/orbconf.h" +#include "ace/CORBA_macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -35,4 +39,5 @@ ACE_CHECK_RETURN (RETURN) #include /**/ "ace/post.h" + #endif /* TAO_POA_MACROS_H */ diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp index 9c548fafaf6..5d9c2809d47 100644 --- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp @@ -8,6 +8,8 @@ ACE_RCSID(RTCORBA, Continuous_Priority_Mapping, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Continuous_Priority_Mapping::TAO_Continuous_Priority_Mapping (int policy) : policy_ (policy) { @@ -128,4 +130,6 @@ TAO_Continuous_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priori } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h index a227587ae57..9000ab6f672 100644 --- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file Continuous_Priority_Mapping.h @@ -24,6 +26,8 @@ #include "rtcorba_export.h" #include "Priority_Mapping.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Continuous_Priority_Mapping * @@ -42,7 +46,6 @@ * This class was previously called Direct_Priority_Mapping. * * \nosubgrouping - * **/ class TAO_RTCORBA_Export TAO_Continuous_Priority_Mapping : public TAO_Priority_Mapping @@ -69,6 +72,8 @@ private: int max_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp index e415bde990a..cc48b3db39c 100644 --- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp @@ -11,6 +11,8 @@ ACE_RCSID(RTCORBA, Direct_Priority_Mapping, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (long) { } @@ -35,4 +37,6 @@ TAO_Direct_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, return 1; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h index 1195b6e4f4d..f4fbcac44e3 100644 --- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h @@ -1,4 +1,6 @@ -//============================================================================= +// -*- C++ -*- + +// ======================================================================= /** * @file Direct_Priority_Mapping.h * @@ -9,6 +11,7 @@ * * @author Carlos O'Ryan (coryan@cs.wustl.edu) */ +// ======================================================================= #ifndef TAO_DIRECT_PRIORITY_MAPPING_H #define TAO_DIRECT_PRIORITY_MAPPING_H @@ -24,6 +27,8 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Direct_Priority_Mapping * @@ -34,7 +39,7 @@ class TAO_RTCORBA_Export TAO_Direct_Priority_Mapping : public TAO_Priority_Mapping { public: - /// Default constructor + TAO_Direct_Priority_Mapping (long); /// The destructor @@ -46,10 +51,10 @@ public: virtual CORBA::Boolean to_CORBA (RTCORBA::NativePriority native_priority, RTCORBA::Priority &corba_priority); - -private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp index 084c47418b2..4d3c4724595 100644 --- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp @@ -39,7 +39,7 @@ ACE_RCSID (RTCORBA, #define IPDSFIELD_CE_MASK 0x01 #define IPDSFIELD_DSCP_EF 0x2E -static int dscp [] = +static int const dscp[] = { IPDSFIELD_DSCP_DEFAULT , IPDSFIELD_DSCP_CS1 , @@ -65,7 +65,7 @@ static int dscp [] = }; /* -static const char *dscp_char[]= +static const char * const dscp_char[]= { "Normal", "CS1", @@ -91,6 +91,8 @@ static const char *dscp_char[]= }; */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Linear_Network_Priority_Mapping::TAO_Linear_Network_Priority_Mapping (long) { } @@ -135,4 +137,6 @@ TAO_Linear_Network_Priority_Mapping::to_CORBA (RTCORBA::NetworkPriority network_ return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h index 34783c3b1c5..7953d46cac4 100644 --- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -31,6 +33,8 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Linear_Network_Priority_Mapping * @@ -42,8 +46,8 @@ class TAO_RTCORBA_Export TAO_Linear_Network_Priority_Mapping : public TAO_Network_Priority_Mapping { public: - /// Default constructor - TAO_Linear_Network_Priority_Mapping (long policy); + + TAO_Linear_Network_Priority_Mapping (long); CORBA::Boolean to_network (RTCORBA::Priority corba_priority, RTCORBA::NetworkPriority &network_priority); @@ -52,6 +56,8 @@ public: RTCORBA::Priority &corba_priority); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp index c793c7cfa0d..5963a6c9a02 100644 --- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp @@ -13,11 +13,14 @@ ACE_RCSID (RTCORBA, Linear_Priority_Mapping, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Linear_Priority_Mapping::TAO_Linear_Priority_Mapping (long policy) : policy_ (policy) + , min_ (ACE_Sched_Params::priority_min (this->policy_)) + , max_ (ACE_Sched_Params::priority_max (this->policy_)) { - this->min_ = ACE_Sched_Params::priority_min (this->policy_); - this->max_ = ACE_Sched_Params::priority_max (this->policy_); } TAO_Linear_Priority_Mapping::~TAO_Linear_Priority_Mapping (void) @@ -25,8 +28,9 @@ TAO_Linear_Priority_Mapping::~TAO_Linear_Priority_Mapping (void) } CORBA::Boolean -TAO_Linear_Priority_Mapping::to_native (RTCORBA::Priority corba_priority, - RTCORBA::NativePriority &native_priority) +TAO_Linear_Priority_Mapping::to_native ( + RTCORBA::Priority corba_priority, + RTCORBA::NativePriority &native_priority) { if (corba_priority < RTCORBA::minPriority // The line below will always be false unless the value of @@ -160,4 +164,6 @@ TAO_Linear_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, #endif /* ACE_WIN32 */ } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h index bee37377c26..835e4642a6b 100644 --- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +34,8 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Linear_Priority_Mapping * @@ -51,22 +55,22 @@ public: /// The destructor virtual ~TAO_Linear_Priority_Mapping (void); - virtual CORBA::Boolean - to_native (RTCORBA::Priority corba_priority, - RTCORBA::NativePriority &native_priority); - virtual CORBA::Boolean - to_CORBA (RTCORBA::NativePriority native_priority, - RTCORBA::Priority &corba_priority); + virtual CORBA::Boolean to_native (RTCORBA::Priority corba_priority, + RTCORBA::NativePriority &native_priority); + virtual CORBA::Boolean to_CORBA (RTCORBA::NativePriority native_priority, + RTCORBA::Priority &corba_priority); private: /// The scheduling policy long policy_; // The range - int min_; - int max_; + int const min_; + int const max_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp index 2704acc9628..6a2b51943e4 100644 --- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp @@ -1,5 +1,4 @@ // $Id$ -// Multi_Priority_Mapping.cpp,v 1.0 #include "tao/orbconf.h" @@ -14,20 +13,22 @@ ACE_RCSID (RTCORBA, Multi_Priority_Mapping, "$Id$") -TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping (int base_native_priority, - int base_corba_priority, - int priority_spacing, - int priorities_contiguous, - int policy) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping ( + int base_native_priority, + int base_corba_priority, + int priority_spacing, + int priorities_contiguous, + int policy) : base_native_priority_ (base_native_priority) , base_corba_priority_ (base_corba_priority) , priority_spacing_ (priority_spacing) , priorities_contiguous_(priorities_contiguous) , policy_ (policy) + , min_ (ACE_Sched_Params::priority_min (this->policy_)) + , max_ (ACE_Sched_Params::priority_max (this->policy_)) { - this->min_ = ACE_Sched_Params::priority_min (this->policy_); - this->max_ = ACE_Sched_Params::priority_max (this->policy_); - if ( this->min_ < this->max_ ) { if (base_native_priority_ < this->min_) @@ -231,4 +232,6 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, return 1; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h index 6d5b3623dc7..a3b3b58ec75 100644 --- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h @@ -1,5 +1,6 @@ +// -*- C++ -*- + // $Id$ -// Multi_Priority_Mapping.h,v 1.0 // ============================================================================ // @@ -30,6 +31,8 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Multi_Priority_Mapping * @@ -41,7 +44,8 @@ * ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA * priorities (0...32767) */ -class TAO_RTCORBA_Export TAO_Multi_Priority_Mapping : public TAO_Priority_Mapping +class TAO_RTCORBA_Export TAO_Multi_Priority_Mapping +: public TAO_Priority_Mapping { public: /// Default constructor @@ -82,11 +86,13 @@ private: /// The scheduling policy int policy_; - int min_; - int max_; + int const min_; + int const max_; // The range }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #endif /* TAO_MULTI_PRIORITY_MAPPING_H */ diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp index cc7eb22da38..29829066d61 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp @@ -10,8 +10,12 @@ ACE_RCSID(RTCORBA, #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Network_Priority_Mapping::~TAO_Network_Priority_Mapping (void) { } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Network_Priority_Mapping.h index 5c847b1f984..8080d9f7e9f 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.h @@ -1,3 +1,4 @@ +// -*- C++ -*- //============================================================================= /** @@ -30,6 +31,8 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Network_Priority_Mapping * @@ -51,6 +54,8 @@ public: RTCORBA::Priority &corba_priority) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp index 80380c5d6ad..7b712efaf0e 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp @@ -12,11 +12,13 @@ ACE_RCSID (RTCORBA, Network_Priority_Mapping_Manager, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Network_Priority_Mapping_Manager::~TAO_Network_Priority_Mapping_Manager ( void ) { - delete mapping_; + delete this->mapping_; } TAO_Network_Priority_Mapping_Manager_ptr @@ -52,5 +54,8 @@ TAO_Network_Priority_Mapping_Manager::_interface_repository_id (void) const { return "IDL:Network_Priority_Mapping_Manager:1.0"; } + +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i index 6a483ec6cd9..919fecdfcab 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // ************************************************************* // Inline operations for class TAO_Network_Priority_Mapping_Manager_var // ************************************************************* @@ -207,14 +211,15 @@ TAO_Network_Priority_Mapping_Manager::TAO_Network_Priority_Mapping_Manager (RTCO ACE_INLINE RTCORBA::NetworkPriorityMapping * TAO_Network_Priority_Mapping_Manager::mapping (void) { - return mapping_; + return this->mapping_; } ACE_INLINE void TAO_Network_Priority_Mapping_Manager::mapping (RTCORBA::NetworkPriorityMapping *mapping) { - delete mapping_; - mapping_ = mapping; + delete this->mapping_; + this->mapping_ = mapping; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/Priority_Mapping.cpp b/TAO/tao/RTCORBA/Priority_Mapping.cpp index 99ad2c6bbfd..6b8aac5b956 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Priority_Mapping.cpp @@ -10,7 +10,12 @@ ACE_RCSID(RTCORBA, Priority_Mapping, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Priority_Mapping::~TAO_Priority_Mapping (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Priority_Mapping.h b/TAO/tao/RTCORBA/Priority_Mapping.h index 0e1bcbce46e..76b099b0d6d 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Priority_Mapping.h @@ -30,6 +30,8 @@ #include "RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Priority_Mapping * @@ -51,6 +53,8 @@ public: RTCORBA::Priority &corba_priority) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp index 11a7d1c9ed3..7dd3fd104d1 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp @@ -12,9 +12,11 @@ ACE_RCSID (RTCORBA, Priority_Mapping_Manager, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager (void) { - delete mapping_; + delete this->mapping_; } TAO_Priority_Mapping_Manager_ptr @@ -46,5 +48,7 @@ TAO_Priority_Mapping_Manager::_interface_repository_id (void) const return "IDL:Priority_Mapping_Manager:1.0"; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h index 3b5d06c7808..1507518ec4f 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file Priority_Mapping_Manager.h @@ -26,6 +27,8 @@ #include "Priority_Mapping.h" #include "tao/LocalObject.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Priority_Mapping_Manager; class TAO_Priority_Mapping_Manager_var; typedef TAO_Priority_Mapping_Manager *TAO_Priority_Mapping_Manager_ptr; @@ -139,6 +142,8 @@ private: TAO_Priority_Mapping_Manager_ptr &ptr_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Priority_Mapping_Manager.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i index 77eb6dec547..4d8fa4007ab 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // ************************************************************* // Inline operations for class TAO_Priority_Mapping_Manager_var // ************************************************************* @@ -207,14 +211,14 @@ TAO_Priority_Mapping_Manager::TAO_Priority_Mapping_Manager (RTCORBA::PriorityMap ACE_INLINE RTCORBA::PriorityMapping * TAO_Priority_Mapping_Manager::mapping (void) { - return mapping_; + return this->mapping_; } ACE_INLINE void TAO_Priority_Mapping_Manager::mapping (RTCORBA::PriorityMapping *mapping) { - delete mapping_; - mapping_ = mapping; + delete this->mapping_; + this->mapping_ = mapping; } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RTCORBA.cpp b/TAO/tao/RTCORBA/RTCORBA.cpp index f1bf07f576d..79ee6e4a6a6 100644 --- a/TAO/tao/RTCORBA/RTCORBA.cpp +++ b/TAO/tao/RTCORBA/RTCORBA.cpp @@ -8,9 +8,13 @@ ACE_RCSID (RTCORBA, RTCORBA, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RTCORBA_Initializer::TAO_RTCORBA_Initializer (void) { ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_ORB_Loader); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RTCORBA.h b/TAO/tao/RTCORBA/RTCORBA.h index f996f03c640..0f4e1617d4e 100644 --- a/TAO/tao/RTCORBA/RTCORBA.h +++ b/TAO/tao/RTCORBA/RTCORBA.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ //============================================================================= @@ -29,6 +31,8 @@ #if TAO_HAS_CORBA_MESSAGING == 1 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTCORBA_Export TAO_RTCORBA_Initializer { public: @@ -38,6 +42,8 @@ public: static TAO_RTCORBA_Initializer TAO_RTCORBA_initializer; +TAO_END_VERSIONED_NAMESPACE_DECL + #define TAO_RTCORBA_SAFE_INCLUDE #include "RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp index 9bc7068f28c..ef85c2e198f 100644 --- a/TAO/tao/RTCORBA/RT_Current.cpp +++ b/TAO/tao/RTCORBA/RT_Current.cpp @@ -18,6 +18,8 @@ ACE_RCSID (RTCORBA, RT_Current, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RT_Current::TAO_RT_Current (TAO_ORB_Core *orb_core) : orb_core_ (orb_core) { @@ -65,4 +67,6 @@ TAO_RT_Current::the_priority (RTCORBA::Priority the_priority ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO)); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h index eed5b7e39f9..61080877d2a 100644 --- a/TAO/tao/RTCORBA/RT_Current.h +++ b/TAO/tao/RTCORBA/RT_Current.h @@ -34,6 +34,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_RT_Current * @@ -42,8 +44,8 @@ * Allows setting/getting the priority of the current thread. */ class TAO_RTCORBA_Export TAO_RT_Current - : public RTCORBA::Current, - public TAO_Local_RefCounted_Object + : public RTCORBA::Current + , public TAO_Local_RefCounted_Object { public: @@ -66,10 +68,12 @@ protected: private: /// ORB Core that owns us. - TAO_ORB_Core *orb_core_; + TAO_ORB_Core * const orb_core_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp index 874795e7a10..1bc5d632299 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp @@ -18,6 +18,8 @@ ACE_RCSID (RTCORBA, // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + RT_Endpoint_Selector_Factory::RT_Endpoint_Selector_Factory (void) { ACE_NEW (this->rt_invocation_endpoint_selector_, @@ -35,6 +37,8 @@ RT_Endpoint_Selector_Factory::get_selector (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return this->rt_invocation_endpoint_selector_; } +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** ACE_STATIC_SVC_DEFINE (RT_Endpoint_Selector_Factory, diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h index b6b5eca2d76..cbb9903e36c 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h +++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -31,6 +31,8 @@ #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RT_Invocation_Endpoint_Selector; // **************************************************************** @@ -65,6 +67,8 @@ private: TAO_RT_Invocation_Endpoint_Selector *rt_invocation_endpoint_selector_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, RT_Endpoint_Selector_Factory) ACE_FACTORY_DECLARE (TAO_RTCORBA, RT_Endpoint_Selector_Factory) diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp index 51be9a65283..e8fb65afe61 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp +++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp @@ -14,6 +14,8 @@ ACE_RCSID (RTCORBA, // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Policy * TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type, TAO::Profile_Transport_Resolver &r @@ -49,4 +51,6 @@ TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type, return policy; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h index 26dd559c5c7..e39da435abf 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h +++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -27,6 +27,8 @@ #include "tao/Policy_ForwardC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { class Profile_Transport_Resolver; @@ -51,6 +53,8 @@ private: TAO_RT_Endpoint_Utils (); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* RT_ENDPOINT_UTILS_H */ diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp index eff4b4a1520..2ffca97ffa8 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp @@ -22,6 +22,8 @@ ACE_RCSID (RTCORBA, RT_Invocation_Endpoint_Selectors, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO_RT_Invocation_Endpoint_Selector::select_endpoint ( TAO::Profile_Transport_Resolver *r, @@ -373,4 +375,6 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h index 539cc86f44b..dac3caff71e 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -34,6 +34,8 @@ #include "tao/Invocation_Endpoint_Selectors.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_RT_Invocation_Endpoint_Selector * @@ -43,8 +45,8 @@ * private connection policy. * **/ -class TAO_RTCORBA_Export TAO_RT_Invocation_Endpoint_Selector : - public TAO_Invocation_Endpoint_Selector +class TAO_RTCORBA_Export TAO_RT_Invocation_Endpoint_Selector + : public TAO_Invocation_Endpoint_Selector { public: @@ -66,6 +68,8 @@ protected: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp index 43dd460981a..05708d1e326 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.cpp +++ b/TAO/tao/RTCORBA/RT_Mutex.cpp @@ -10,9 +10,7 @@ ACE_RCSID(RTCORBA, RT_Mutex, "$Id$") -TAO_RT_Mutex::TAO_RT_Mutex (void) -{ -} +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RT_Mutex::~TAO_RT_Mutex (void) { @@ -78,7 +76,7 @@ TAO_RT_Mutex::name (void) const return 0; } -//////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// #if (TAO_HAS_NAMED_RT_MUTEXES == 1) TAO_Named_RT_Mutex::TAO_Named_RT_Mutex (const char *name) : name_ (name) @@ -92,6 +90,8 @@ TAO_Named_RT_Mutex::name (void) const } #endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */ -//////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// + +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h index c12409e8cd0..187e7aebc09 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.h +++ b/TAO/tao/RTCORBA/RT_Mutex.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file RT_Mutex.h @@ -37,6 +38,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_RT_Mutex * @@ -53,11 +56,6 @@ class TAO_RTCORBA_Export TAO_RT_Mutex public TAO_Local_RefCounted_Object { public: - /// Constructor. - TAO_RT_Mutex (void); - - /// Destructor. - virtual ~TAO_RT_Mutex (void); /// Acquire the lock. virtual void lock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) @@ -81,6 +79,11 @@ public: virtual const char *name (void) const; protected: + + /// Destructor. + virtual ~TAO_RT_Mutex (void); + +protected: /// Synchronization lock. TAO_SYNCH_MUTEX mu_; }; @@ -108,6 +111,8 @@ protected: }; #endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */ +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp index 6d996e8e171..d1bf5f89255 100644 --- a/TAO/tao/RTCORBA/RT_ORB.cpp +++ b/TAO/tao/RTCORBA/RT_ORB.cpp @@ -17,6 +17,8 @@ ACE_RCSID(RTCORBA, RT_ORB, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core) : orb_core_ (orb_core), mutex_mgr_ (), @@ -546,6 +548,8 @@ TAO_RT_ORB::modify_thread_scheduling_policy (CORBA::ORB_ptr orb) } -//////////////////////////////////////////////////////////////////////////////// +TAO_END_VERSIONED_NAMESPACE_DECL + +/////////////////////////////////////////////////////////////////////////////// #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h index 9b5daea2202..7a4c2a82648 100644 --- a/TAO/tao/RTCORBA/RT_ORB.h +++ b/TAO/tao/RTCORBA/RT_ORB.h @@ -105,6 +105,7 @@ class TAO_RTCORBA_Export TAO_RT_ORB public TAO_Local_RefCounted_Object { public: + /// Constructor. TAO_RT_ORB (TAO_ORB_Core *orb_core); @@ -302,12 +303,15 @@ public: static int modify_thread_scheduling_policy (CORBA::ORB_ptr orb); protected: + /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_RT_ORB (void); +protected: + /// Reference to our creating ORB Core. - TAO_ORB_Core *orb_core_; + TAO_ORB_Core * const orb_core_; /// mutex_mgr_ manages the names associated with named mutexes. TAO_Named_RT_Mutex_Manager mutex_mgr_; diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp index 2f9e0637f19..b9fb8936771 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp @@ -36,14 +36,16 @@ ACE_RCSID (RTCORBA, #include "ace/Svc_Conf.h" #include "ace/Sched_Params.h" -static const char *rt_poa_factory_name = "TAO_RT_Object_Adapter_Factory"; -static const ACE_TCHAR *rt_poa_factory_directive = +static const char rt_poa_factory_name[] = "TAO_RT_Object_Adapter_Factory"; +static const ACE_TCHAR rt_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE( "TAO_RT_Object_Adapter_Factory", "TAO_RTPortableServer", "_make_TAO_RT_Object_Adapter_Factory", ""); +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RT_ORBInitializer::TAO_RT_ORBInitializer (int priority_mapping_type, int network_priority_mapping_type, int ace_sched_policy, @@ -257,7 +259,7 @@ TAO_RT_ORBInitializer::register_policy_factories ( // Bind the same policy factory to all RTCORBA related policy // types since a single policy factory is used to create each of // the different types of RTCORBA policies. - CORBA::PolicyType type[] = { + static CORBA::PolicyType const type[] = { RTCORBA::PRIORITY_MODEL_POLICY_TYPE, RTCORBA::THREADPOOL_POLICY_TYPE, RTCORBA::SERVER_PROTOCOL_POLICY_TYPE, @@ -269,7 +271,7 @@ TAO_RT_ORBInitializer::register_policy_factories ( const CORBA::PolicyType *end = type + sizeof (type) / sizeof (type[0]); - for (CORBA::PolicyType *i = type; + for (CORBA::PolicyType const * i = type; i != end; ++i) { @@ -303,4 +305,6 @@ TAO_RT_ORBInitializer::register_policy_factories ( } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h index be73cbd49d0..02536b67b81 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.h +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h @@ -37,10 +37,12 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// RTCORBA ORB initializer. -class TAO_RTCORBA_Export TAO_RT_ORBInitializer : - public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object +class TAO_RT_ORBInitializer + : public virtual PortableInterceptor::ORBInitializer + , public virtual TAO_Local_RefCounted_Object { public: /// Priority mapping types @@ -121,6 +123,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp index b395043b553..ce431bd195a 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp @@ -14,10 +14,7 @@ ACE_RCSID (RTCORBA, RT_ORB_Loader, "$Id$") - -TAO_RT_ORB_Loader::TAO_RT_ORB_Loader (void) -{ -} +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RT_ORB_Loader::~TAO_RT_ORB_Loader (void) { @@ -194,6 +191,8 @@ TAO_RT_ORB_Loader::init (int argc, return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ///////////////////////////////////////////////////////////////////// ACE_FACTORY_DEFINE (TAO_RTCORBA, TAO_RT_ORB_Loader) diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.h b/TAO/tao/RTCORBA/RT_ORB_Loader.h index 402c314f403..49cf2cfd579 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.h +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -30,13 +30,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; class TAO_RTCORBA_Export TAO_RT_ORB_Loader : public ACE_Service_Object { public: - /// Constructor. - TAO_RT_ORB_Loader (void); /// Destructor. virtual ~TAO_RT_ORB_Loader (void); @@ -46,6 +46,8 @@ public: ACE_TCHAR* []); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_ORB_Loader) ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_ORB_Loader) diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp index 7e5bd32fd68..e1dd1ca7578 100644 --- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp +++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp @@ -11,6 +11,8 @@ ACE_RCSID (RTCORBA, #include "tao/PolicyC.h" #include "tao/ORB_Constants.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Policy_ptr TAO_RT_PolicyFactory::create_policy ( CORBA::PolicyType type, @@ -102,4 +104,6 @@ TAO_RT_PolicyFactory::_create_policy ( CORBA::Policy::_nil ()); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h index 3fa55b3afe8..88ffb9f91d3 100644 --- a/TAO/tao/RTCORBA/RT_PolicyFactory.h +++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h @@ -37,8 +37,10 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Policy factory for all RTCORBA related policies. -class TAO_RTCORBA_Export TAO_RT_PolicyFactory +class TAO_RT_PolicyFactory : public PortableInterceptor::PolicyFactory, public CORBA::LocalObject { @@ -56,6 +58,8 @@ public: CORBA::PolicyError)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp index 3cd3f89a885..ac8f47445cd 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.cpp +++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp @@ -18,8 +18,11 @@ ACE_RCSID (RTCORBA, // **************************************************************** -TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (RTCORBA::PriorityModel priority_model, - RTCORBA::Priority server_priority) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_PriorityModelPolicy::TAO_PriorityModelPolicy ( + RTCORBA::PriorityModel priority_model, + RTCORBA::Priority server_priority) : ACE_NESTED_CLASS (CORBA, Object) () , ACE_NESTED_CLASS (CORBA, Policy) () , ACE_NESTED_CLASS (CORBA, LocalObject) () @@ -1402,4 +1405,6 @@ TAO_Protocol_Properties_Factory::create_orb_protocol_property (IOP::ProfileId id return property; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h index 689ee8e961e..77949403a6d 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.h +++ b/TAO/tao/RTCORBA/RT_Policy_i.h @@ -38,6 +38,8 @@ #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_PriorityModelPolicy * @@ -892,10 +894,13 @@ public: */ static RTCORBA::ProtocolProperties *create_orb_protocol_property (IOP::ProfileId id); -protected: +private: + TAO_Protocol_Properties_Factory (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index 2f79523a96f..f98c570213d 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -26,11 +26,15 @@ ACE_RCSID (RTCORBA, RT_Protocols_Hooks, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RT_Protocols_Hooks::TAO_RT_Protocols_Hooks (void) + : orb_core_ (0) + , current_ () { } + TAO_RT_Protocols_Hooks::~TAO_RT_Protocols_Hooks (void) { } @@ -811,6 +815,8 @@ TAO_RT_Protocols_Hooks::set_thread_native_priority ( return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_RT_Protocols_Hooks, ACE_TEXT ("RT_Protocols_Hooks"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h index f5bc260e298..e0f6539b3da 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h @@ -1,4 +1,3 @@ - // -*- C++ -*- // =================================================================== @@ -8,7 +7,6 @@ * $Id$ * * @author Priyanka Gontla <pgontla@ece.uci.edu> - * */ // =================================================================== @@ -32,9 +30,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTCORBA_Export TAO_RT_Protocols_Hooks : public TAO_Protocols_Hooks { public: + /// Constructor TAO_RT_Protocols_Hooks (void); @@ -174,6 +175,8 @@ protected: RTCORBA::ProtocolProperties_ptr protocol_properties ACE_ENV_ARG_DECL); +protected: + TAO_ORB_Core *orb_core_; // Save a reference to the priority mapping manager. @@ -183,6 +186,8 @@ protected: RTCORBA::Current_var current_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Protocols_Hooks) ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Protocols_Hooks) diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp index 6804f192d18..10743cbba09 100644 --- a/TAO/tao/RTCORBA/RT_Stub.cpp +++ b/TAO/tao/RTCORBA/RT_Stub.cpp @@ -15,6 +15,8 @@ ACE_RCSID (RTCORBA, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RT_Stub::TAO_RT_Stub (const char *repository_id, const TAO_MProfile &profiles, TAO_ORB_Core *orb_core) @@ -297,4 +299,6 @@ TAO_RT_Stub::effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL) 0); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h index a0b41aa7146..11a59ee51fe 100644 --- a/TAO/tao/RTCORBA/RT_Stub.h +++ b/TAO/tao/RTCORBA/RT_Stub.h @@ -31,6 +31,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward references. class TAO_PriorityModelPolicy; class TAO_PriorityBandedConnectionPolicy; @@ -129,6 +131,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp index b28965a7891..eb402f62b9d 100644 --- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp +++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp @@ -16,6 +16,8 @@ ACE_RCSID (RTCORBA, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RT_Stub_Factory::~TAO_RT_Stub_Factory (void) { } @@ -40,6 +42,8 @@ TAO_RT_Stub_Factory::create_stub (const char *repository_id, return retval; } +TAO_END_VERSIONED_NAMESPACE_DECL + // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_RT_Stub_Factory, diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h index 213f88bab1f..8dfe39dd4ea 100644 --- a/TAO/tao/RTCORBA/RT_Stub_Factory.h +++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file RT_Stub_Factory.h @@ -8,7 +10,6 @@ * This class creates the default stub, that is used in * plain CORBA. * - * * @author Angelo Corsaro <corsaro@cs.wustl.edu> * @author Frank Hunleth <fhunleth@cs.wustl.edu> */ @@ -33,6 +34,8 @@ #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_RT_Stub_Factory * @@ -54,6 +57,8 @@ public: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Stub_Factory) ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Stub_Factory) diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp index fbde6dd0101..1b7aa28ff78 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp @@ -16,6 +16,8 @@ ACE_RCSID (RTCORBA, #include "tao/LF_Follower.h" #include "tao/Leader_Follower.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RT_Thread_Lane_Resources_Manager::TAO_RT_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core) : TAO_Thread_Lane_Resources_Manager (orb_core), default_lane_resources_ (0), @@ -145,6 +147,8 @@ TAO_RT_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_manag return manager; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_RT_Thread_Lane_Resources_Manager_Factory, ACE_TEXT ("RT_Thread_Lane_Resources_Manager_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h index ef95981c8be..a1cfe5cdbf8 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file RT_Thread_Lane_Resources_Manager.h @@ -24,6 +26,9 @@ #include "tao/Thread_Lane_Resources_Manager.h" #include "ace/Service_Config.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Thread_Pool_Manager; /** @@ -100,6 +105,8 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory) ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory) diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp index 8eb6ded878a..4eefe566719 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp @@ -12,6 +12,8 @@ ACE_RCSID(RTCORBA, TAO_RT_Transport_Descriptor, "$Id$") #include "RT_Transport_Descriptor_Property.h" #include "tao/Endpoint.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RT_Transport_Descriptor::~TAO_RT_Transport_Descriptor () { if (this->delete_properties_ == 1) @@ -112,3 +114,5 @@ TAO_RT_Transport_Descriptor::hash (void) const { return this->endpoint_->hash (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h index b485d8484a5..d783d6c80e9 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file RT_Transport_Descriptor.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_RT_TRANSPORT_DESCRIPTOR_H @@ -24,6 +23,8 @@ #include "tao/Transport_Descriptor_Interface.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_RT_Transport_Descriptor * @@ -68,6 +69,8 @@ private: int delete_properties_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "RT_Transport_Descriptor.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl index 0c158812e9f..3afd7b186e8 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_RT_Transport_Descriptor::TAO_RT_Transport_Descriptor (TAO_Endpoint *endpoint, CORBA::Boolean flag) @@ -16,3 +20,5 @@ TAO_RT_Transport_Descriptor::insert (TAO_RT_Transport_Descriptor_Property *descr this->property_list_ = descriptor_property; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp index bc59aab60d0..73cd7fd9469 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp @@ -12,6 +12,8 @@ ACE_RCSID (RTCORBA, TAO_RT_Transport_Descriptor_Property, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RT_Transport_Descriptor_Property::~TAO_RT_Transport_Descriptor_Property (void) { } @@ -74,3 +76,5 @@ TAO_RT_Transport_Descriptor_Banded_Connection_Property::is_equivalent (const TAO this->low_priority_ == rhs->low_priority_ && this->high_priority_ == rhs->high_priority_); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h index adfb279edf9..99673b20d3f 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h @@ -1,12 +1,11 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file RT_Transport_Descriptor_Property.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> - * - * */ #ifndef TAO_RT_TRANSPORT_DESCRIPTOR_PROPERTY_H @@ -24,6 +23,8 @@ #include "ace/Global_Macros.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_RT_Transport_Descriptor_Property * @@ -93,7 +94,7 @@ private: }; -/*************************************************************************************************/ +/*****************************************************************************/ /** * @class TAO_RT_Transport_Descriptor_Banded_Connection_Property @@ -130,7 +131,9 @@ protected: CORBA::Short high_priority_; }; -/*************************************************************************************************/ +TAO_END_VERSIONED_NAMESPACE_DECL + +/*****************************************************************************/ #if defined (__ACE_INLINE__) #include "RT_Transport_Descriptor_Property.inl" diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl index c6646a943fb..89c98fe4485 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_RT_Transport_Descriptor_Property::TAO_RT_Transport_Descriptor_Property (void) : next_ (0) @@ -49,3 +53,5 @@ TAO_RT_Transport_Descriptor_Banded_Connection_Property::init (CORBA::Short low_p this->low_priority_ = low_priority; this->high_priority_ = high_priority; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index f274fb38a18..4e8686d5b35 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -22,6 +22,8 @@ ACE_RCSID (RTCORBA, #include "tao/Leader_Follower.h" #include "ace/Auto_Ptr.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RT_New_Leader_Generator::TAO_RT_New_Leader_Generator ( TAO_Thread_Lane &lane) : lane_ (lane) @@ -867,4 +869,6 @@ TAO_Thread_Pool_Manager::orb_core (void) const return this->orb_core_; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h index d1c5d45a624..e95f205e4f6 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.h +++ b/TAO/tao/RTCORBA/Thread_Pool.h @@ -33,6 +33,8 @@ #include "ace/Task.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Thread_Lane; /** @@ -418,6 +420,8 @@ private: // @} +private: + TAO_ORB_Core &orb_core_; THREAD_POOLS thread_pools_; @@ -425,6 +429,8 @@ private: ACE_SYNCH_MUTEX lock_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Thread_Pool.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/RTCORBA/Thread_Pool.inl b/TAO/tao/RTCORBA/Thread_Pool.inl index e76815436e7..b22d8b96284 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.inl +++ b/TAO/tao/RTCORBA/Thread_Pool.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Thread_Lane & TAO_Thread_Pool_Threads::lane (void) const @@ -147,5 +151,4 @@ TAO_Thread_Pool::number_of_lanes (void) const return this->number_of_lanes_; } - - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/rtcorba_typedefs.h b/TAO/tao/RTCORBA/rtcorba_typedefs.h index d39f5b27a2d..513e1a4169d 100644 --- a/TAO/tao/RTCORBA/rtcorba_typedefs.h +++ b/TAO/tao/RTCORBA/rtcorba_typedefs.h @@ -24,6 +24,7 @@ #include "tao/Basic_Types.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward references. class TAO_Priority_Mapping_Manager; @@ -55,6 +56,7 @@ namespace RTCORBA // End TAO-specific typedef } +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*TAO_RTCORBA_TYPEDEFS_H*/ diff --git a/TAO/tao/RTPortableServer/RTPortableServer.cpp b/TAO/tao/RTPortableServer/RTPortableServer.cpp index a1e3ab95a43..bd538798210 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServer.cpp @@ -1,5 +1,3 @@ -/* -*- C++ -*- */ - // $Id$ // ================================================================= // @@ -23,9 +21,12 @@ ACE_RCSID (RTPortableServer, RTPortableServer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RTPortableServer_Initializer::TAO_RTPortableServer_Initializer (void) { ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Object_Adapter_Factory); } +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RTPortableServer.h b/TAO/tao/RTPortableServer/RTPortableServer.h index 8202b682ad6..8bdb8e554c8 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.h +++ b/TAO/tao/RTPortableServer/RTPortableServer.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file RTPortableServer.h @@ -25,6 +26,8 @@ #include "tao/RTCORBA/RTCORBA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTPortableServer_Export TAO_RTPortableServer_Initializer { public: @@ -34,6 +37,8 @@ public: static TAO_RTPortableServer_Initializer TAO_RTPortableServer_initializer; +TAO_END_VERSIONED_NAMESPACE_DECL + #define TAO_RT_PORTABLESERVER_SAFE_INCLUDE #include "RTPortableServerC.h" #undef TAO_RT_PORTABLESERVER_SAFE_INCLUDE diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp index 0ebc6f73ac2..b409456b4bd 100644 --- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp +++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "RT_Acceptor_Filters.h" @@ -12,18 +12,22 @@ ACE_RCSID (RTPortableServer, RT_Acceptor_Filter, "$Id$") -TAO_Server_Protocol_Acceptor_Filter:: -TAO_Server_Protocol_Acceptor_Filter (RTCORBA::ProtocolList &protocols) + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Server_Protocol_Acceptor_Filter::TAO_Server_Protocol_Acceptor_Filter ( + RTCORBA::ProtocolList &protocols) : protocols_ (protocols) { } int -TAO_Server_Protocol_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key, - TAO_MProfile &mprofile, - TAO_Acceptor **acceptors_begin, - TAO_Acceptor **acceptors_end, - CORBA::Short priority) +TAO_Server_Protocol_Acceptor_Filter::fill_profile ( + const TAO::ObjectKey &object_key, + TAO_MProfile &mprofile, + TAO_Acceptor **acceptors_begin, + TAO_Acceptor **acceptors_end, + CORBA::Short priority) { // RTCORBA 1.0, Section 4.15.1: ServerProtocolPolicy determines // which protocols get included into IOR and in what order. @@ -60,4 +64,6 @@ TAO_Server_Protocol_Acceptor_Filter::encode_endpoints (TAO_MProfile &mprofile) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h index 2a8cfe9fea0..a4f5810a1da 100644 --- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h +++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h @@ -1,4 +1,5 @@ // -*- C++ -*- + //============================================================================= /** * @file RT_Acceptor_Filters.h @@ -31,6 +32,8 @@ #include "tao/RTCORBA/RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Acceptor; /** @@ -63,6 +66,8 @@ private: RTCORBA::ProtocolList &protocols_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp index 8dc4a8cfd0b..031596498a0 100644 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp +++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp @@ -17,6 +17,8 @@ ACE_RCSID(RTPortableServer, #include "tao/RTCORBA/Thread_Pool.h" #include "tao/Profile.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Boolean TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object ACE_ENV_ARG_DECL) const @@ -119,6 +121,8 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_RT_Collocation_Resolver, ACE_TEXT ("RT_Collocation_Resolver"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h index 99d89bff36d..64f3016a4bd 100644 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h +++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file RT_Collocation_Resolver.h @@ -25,6 +27,8 @@ #include "tao/Collocation_Resolver.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_RT_Collocation_Resolver * @@ -44,6 +48,8 @@ public: ACE_ENV_ARG_DECL) const; }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTPortableServer, TAO_RT_Collocation_Resolver) ACE_FACTORY_DECLARE (TAO_RTPortableServer, TAO_RT_Collocation_Resolver) diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp index 5246d3c2a0e..627742817c4 100644 --- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp +++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp @@ -14,9 +14,8 @@ ACE_RCSID (RTPortableServer, RT_Object_Adapter_Factory, "$Id$") -TAO_RT_Object_Adapter_Factory::TAO_RT_Object_Adapter_Factory (void) -{ -} + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Adapter* TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) @@ -54,6 +53,8 @@ TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) return object_adapter; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_RTPortableServer, TAO_RT_Object_Adapter_Factory) ACE_STATIC_SVC_DEFINE (TAO_RT_Object_Adapter_Factory, ACE_TEXT ("TAO_RT_Object_Adapter_Factory"), diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h index 21bd46db733..db886adceb3 100644 --- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h +++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file RT_Object_Adapter_Factory.h @@ -26,17 +27,19 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTPortableServer_Export TAO_RT_Object_Adapter_Factory : public TAO_Adapter_Factory { public: - /// Constructor - TAO_RT_Object_Adapter_Factory (void); /// Create adapter. virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_RT_Object_Adapter_Factory) ACE_FACTORY_DECLARE (TAO_RTPortableServer, TAO_RT_Object_Adapter_Factory) diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index 43dd02f08cb..a4abeb736b6 100644 --- a/TAO/tao/RTPortableServer/RT_POA.cpp +++ b/TAO/tao/RTPortableServer/RT_POA.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "RT_POA.h" @@ -35,6 +35,8 @@ ACE_RCSID (RTPortableServer, RT_POA, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name, TAO_POA_Manager &poa_manager, const TAO_POA_Policy_Set &policies, @@ -951,4 +953,6 @@ TAO_RT_POA::id (ACE_ENV_SINGLE_ARG_DECL) return this->TAO_Regular_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index d3bbb2816d9..f877f7acfc0 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file RT_POA.h @@ -38,13 +39,15 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Thread_Pool; class TAO_Thread_Lane; class TAO_PriorityBandedConnectionPolicy; -class TAO_RTPortableServer_Export TAO_RT_POA : - public virtual RTPortableServer::POA, - public virtual TAO_Regular_POA +class TAO_RTPortableServer_Export TAO_RT_POA + : public virtual RTPortableServer::POA + , public virtual TAO_Regular_POA { public: @@ -310,6 +313,8 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTPortableServer/RT_POA.i b/TAO/tao/RTPortableServer/RT_POA.i index a0c51ad2e6d..9197a39d399 100644 --- a/TAO/tao/RTPortableServer/RT_POA.i +++ b/TAO/tao/RTPortableServer/RT_POA.i @@ -1,3 +1,5 @@ +// -*- C++ -*- +// // $Id$ // Exception macros @@ -5,6 +7,8 @@ #include "tao/PortableServer/POA_Guard.h" #include "tao/Environment.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Object_ptr TAO_RT_POA::create_reference_with_priority (const char * intf, RTCORBA::Priority priority @@ -136,3 +140,5 @@ TAO_RT_POA::thread_pool (void) const { return this->thread_pool_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp index cd8d742f2be..846452db602 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp @@ -18,6 +18,9 @@ ACE_RCSID (RTPortableServer, RT_Policy_Validator, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_POA_RT_Policy_Validator::TAO_POA_RT_Policy_Validator (TAO_ORB_Core &orb_core) : TAO_Policy_Validator (orb_core), thread_pool_ (0) @@ -594,4 +597,6 @@ TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core, return thread_pool; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h index 2c282de4271..6fb9f3b570b 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file RT_Policy_Validator.h @@ -28,6 +30,8 @@ #include "tao/Policy_Validator.h" #include "tao/RTCORBA/RTCORBA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; class TAO_Acceptor_Registry; class TAO_Thread_Pool; @@ -89,6 +93,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index f48c5c202c6..1fc1b8bcba0 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -24,6 +24,9 @@ ACE_RCSID (RTPortableServer, RT_Servant_Dispatcher, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher (void) { } @@ -395,4 +398,6 @@ TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, return poa; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h index 64c083f008b..a278765c310 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -30,12 +30,13 @@ #include "tao/PortableServer/Servant_Dispatcher.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_RT_Servant_Dispatcher * * @brief Concrete instantiation of the Servant_Dispatcher strategy. * - * */ class TAO_RTPortableServer_Export TAO_RT_Servant_Dispatcher : public TAO_Servant_Dispatcher @@ -71,6 +72,8 @@ public: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index b9f61a67120..17a24732dc7 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -13,6 +13,7 @@ ACE_RCSID (RTScheduling, Current, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> TAO_RTScheduler_Current::guid_counter; @@ -28,7 +29,6 @@ TAO_RTScheduler_Current::TAO_RTScheduler_Current (void) } - void TAO_RTScheduler_Current::init (TAO_ORB_Core* orb ACE_ENV_ARG_DECL) @@ -980,3 +980,4 @@ const char* TAO_RTScheduler_Current::_interface_repository_id (void) const return "IDL:TAO_RTScheduler_Current:1.0"; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h index 3486c4bef7c..0cdf4e33055 100644 --- a/TAO/tao/RTScheduling/Current.h +++ b/TAO/tao/RTScheduling/Current.h @@ -28,11 +28,11 @@ #include "ace/Task.h" #include "ace/Atomic_Op.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTScheduler_Current_i; class TAO_TSS_Resources; - /** * @class TAO_DTId_Hash * @@ -383,6 +383,8 @@ public: CORBA::Policy_var implicit_sched_param_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_RTSCHEDULER_CURRENT_H*/ diff --git a/TAO/tao/RTScheduling/Distributable_Thread.cpp b/TAO/tao/RTScheduling/Distributable_Thread.cpp index 998aafe3a5d..7b9e18d91c7 100644 --- a/TAO/tao/RTScheduling/Distributable_Thread.cpp +++ b/TAO/tao/RTScheduling/Distributable_Thread.cpp @@ -3,6 +3,8 @@ #include "Distributable_Thread.h" #include "tao/ORB_Constants.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_DistributableThread::TAO_DistributableThread (void) :state_ (RTScheduling::DistributableThread::ACTIVE) { @@ -47,3 +49,5 @@ TAO_DistributableThread_Factory::create_DT (void) return DT; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/Distributable_Thread.h b/TAO/tao/RTScheduling/Distributable_Thread.h index e73799bc15b..1041826d180 100644 --- a/TAO/tao/RTScheduling/Distributable_Thread.h +++ b/TAO/tao/RTScheduling/Distributable_Thread.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //$Id$ #ifndef DISTRIBUTABLE_THREAD_H @@ -5,6 +7,8 @@ #include "tao/RTScheduling/RTScheduler.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTScheduler_Export TAO_DistributableThread : public RTScheduling::DistributableThread { @@ -32,4 +36,6 @@ public: static RTScheduling::DistributableThread_ptr create_DT (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /*DISTRIBUTABLE_THREAD_H*/ diff --git a/TAO/tao/RTScheduling/RTScheduler.cpp b/TAO/tao/RTScheduling/RTScheduler.cpp index 82eb86ac5b2..3dfe606a49c 100644 --- a/TAO/tao/RTScheduling/RTScheduler.cpp +++ b/TAO/tao/RTScheduling/RTScheduler.cpp @@ -5,7 +5,11 @@ ACE_RCSID (RTScheduler, RTScheduler, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RTScheduler_Initializer::TAO_RTScheduler_Initializer (void) { ACE_Service_Config::process_directive (ace_svc_desc_TAO_RTScheduler_Loader); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/RTScheduler.h b/TAO/tao/RTScheduling/RTScheduler.h index 92c60b13038..b96c286b74a 100644 --- a/TAO/tao/RTScheduling/RTScheduler.h +++ b/TAO/tao/RTScheduling/RTScheduler.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ //============================================================================= @@ -19,11 +21,14 @@ #include "rtscheduler_export.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTScheduler_Export TAO_RTScheduler_Initializer { public: @@ -33,6 +38,8 @@ public: static TAO_RTScheduler_Initializer TAO_RTScheduler_initializer; +TAO_END_VERSIONED_NAMESPACE_DECL + #define TAO_RTSCHEDULER_SAFE_INCLUDE #include "RTSchedulerC.h" #undef TAO_RTSCHEDULER_SAFE_INCLUDE diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp index f6525b3d5fc..cc68ae55bed 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp @@ -18,6 +18,8 @@ ACE_RCSID (TAO, RTScheduler_Initializer, "$Id$") #include "ace/Service_Repository.h" #include "ace/Svc_Conf.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO_RTScheduler_ORB_Initializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info @@ -172,3 +174,5 @@ TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr this->current_->rt_current (rt_current.in ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.h b/TAO/tao/RTScheduling/RTScheduler_Initializer.h index 075af17a661..3f39a4d5985 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.h +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.h @@ -33,17 +33,16 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTScheduler_Current; /// RTCORBA ORB initializer. -class TAO_RTScheduler_Export TAO_RTScheduler_ORB_Initializer : - public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object +class TAO_RTScheduler_ORB_Initializer + : public virtual PortableInterceptor::ORBInitializer + , public virtual TAO_Local_RefCounted_Object { public: - - - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -52,14 +51,17 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: - TAO_RTScheduler_Current* current_; + + TAO_RTScheduler_Current* current_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #include /**/ "ace/post.h" -#endif /* TAO_RTSCHEDULER__INITIALIZER_H */ +#endif /* TAO_RTSCHEDULER_INITIALIZER_H */ diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp index 2c0507a1f5b..2e8928f52ff 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp @@ -11,13 +11,10 @@ ACE_RCSID (TAO, RTScheduler_Loader, "$Id$") -TAO_RTScheduler_Loader::TAO_RTScheduler_Loader (void) -{ -} +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RTScheduler_Loader::~TAO_RTScheduler_Loader (void) { - } int @@ -72,6 +69,8 @@ TAO_RTScheduler_Loader::init (int, return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ///////////////////////////////////////////////////////////////////// ACE_FACTORY_DEFINE (TAO_RTScheduler, TAO_RTScheduler_Loader) diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.h b/TAO/tao/RTScheduling/RTScheduler_Loader.h index 2dc82785123..29f6c082ed1 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Loader.h +++ b/TAO/tao/RTScheduling/RTScheduler_Loader.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -23,14 +23,16 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + #include "ace/Service_Object.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTScheduler_Export TAO_RTScheduler_Loader : public ACE_Service_Object { public: - /// Constructor. - TAO_RTScheduler_Loader (void); /// Destructor. virtual ~TAO_RTScheduler_Loader (void); @@ -40,6 +42,8 @@ public: ACE_TCHAR* []); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTScheduler, TAO_RTScheduler_Loader) ACE_FACTORY_DECLARE (TAO_RTScheduler, TAO_RTScheduler_Loader) diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp index 506ebde419e..cc66f73bf14 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp @@ -8,6 +8,8 @@ ACE_RCSID(TAO, RT_ORB, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_RTScheduler_Manager::TAO_RTScheduler_Manager (void) { @@ -41,3 +43,4 @@ TAO_RTScheduler_Manager::_interface_repository_id (void) const return "IDL:RTScheduler_Manager:1.0"; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h index ecb45489a13..8abd8a587f3 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.h +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file RTScheduler_Manager.h @@ -16,6 +17,7 @@ #include "RTScheduler.h" #include "tao/LocalObject.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTScheduler_Manager; class TAO_RTScheduler_Manager_var; @@ -132,6 +134,8 @@ private: TAO_RTScheduler_Manager_ptr &ptr_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "RTScheduler_Manager.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.i b/TAO/tao/RTScheduling/RTScheduler_Manager.i index 30ec521e2f9..da473a28e64 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.i +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.i @@ -5,6 +5,8 @@ #include "tao/ORB_Core.h" #include "tao/ORB.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // ************************************************************* // Inline operations for class TAO_RTScheduler_Manager_var // ************************************************************* @@ -228,3 +230,5 @@ TAO_RTScheduler_Manager::rtscheduler (RTScheduling::Scheduler_ptr rtscheduler ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index 8169c2b11c0..e8af8eae8f4 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -16,14 +16,11 @@ ACE_RCSID (RTScheduling, Request_Interceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL const IOP::ServiceId Client_Interceptor::SchedulingInfo = 30; -Client_Interceptor::Client_Interceptor (void) -{ -} - void Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL) @@ -497,3 +494,5 @@ Server_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h index 189b5220d47..a0fc55c55a8 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.h +++ b/TAO/tao/RTScheduling/Request_Interceptor.h @@ -13,15 +13,15 @@ #include "tao/PI/PI.h" #include "tao/PI_Server/PI_Server.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + extern ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter; -class TAO_RTScheduler_Export Client_Interceptor : - public PortableInterceptor::ClientRequestInterceptor +class Client_Interceptor + : public PortableInterceptor::ClientRequestInterceptor { public: - Client_Interceptor (void); - // Client_Interceptor (RTScheduling::Current_ptr current); virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -100,4 +100,6 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H */ diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h index a6cc2f54ea3..3152a30434a 100644 --- a/TAO/tao/RTScheduling/ThreadAction.h +++ b/TAO/tao/RTScheduling/ThreadAction.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //$Id$ #ifndef TAO_ThreadAction_H #define TAO_ThreadAction_H @@ -8,6 +10,8 @@ #include "RTSchedulerC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTScheduler_Export TAO_ThreadAction: public RTScheduling::ThreadAction, public TAO_Local_RefCounted_Object @@ -19,4 +23,6 @@ public RTScheduling::ThreadAction, ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /*TAO_ThreadAction_H*/ |