diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-01-30 15:01:17 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-01-30 15:01:17 +0000 |
| commit | 2f8e3a3831d1b99157c77deda5277109bce19836 (patch) | |
| tree | 6c75afb92c7be990454c9109364b4d717a2234c9 | |
| parent | 381d276b94b1bc0937c0eda8e87548a8e4c6cd9d (diff) | |
| download | ATCD-2f8e3a3831d1b99157c77deda5277109bce19836.tar.gz | |
Fri Jan 30 14:52:30 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
184 files changed, 544 insertions, 261 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 835e864b467..de4fdf90128 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,193 @@ +Fri Jan 30 14:52:30 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h: + * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp: + * tao/AnyTypeCode/NVList_Adapter_Impl.h: + * tao/AnyTypeCode/NVList_Adapter_Impl.cpp: + * tao/BiDir_GIOP/BiDirGIOP.h: + * tao/BiDir_GIOP/BiDirGIOP.cpp: + * tao/CORBALOC_Parser.h: + * tao/CORBALOC_Parser.cpp: + * tao/CORBANAME_Parser.h: + * tao/CORBANAME_Parser.cpp: + * tao/CSD_Framework/CSD_Framework_Loader.h: + * tao/CSD_Framework/CSD_Framework_Loader.cpp: + * tao/CSD_Framework/CSD_Object_Adapter_Factory.h: + * tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp: + * tao/CSD_Framework/CSD_Strategy_Repository.h: + * tao/CSD_Framework/CSD_Strategy_Repository.cpp: + * tao/CodecFactory/CodecFactory.h: + * tao/CodecFactory/CodecFactory.cpp: + * tao/Codeset/Codeset_Manager_Factory.h: + * tao/Codeset/Codeset_Manager_Factory.cpp: + * tao/Codeset/UTF16_BOM_Factory.h: + * tao/Codeset/UTF16_BOM_Factory.cpp: + * tao/Codeset/UTF8_Latin1_Factory.h: + * tao/Codeset/UTF8_Latin1_Factory.cpp: + * tao/Codeset_Manager_Factory_Base.h: + * tao/Codeset_Manager_Factory_Base.cpp: + * tao/DLL_Parser.h: + * tao/DLL_Parser.cpp: + * tao/Default_Collocation_Resolver.h: + * tao/Default_Collocation_Resolver.cpp: + * tao/Default_Endpoint_Selector_Factory.h: + * tao/Default_Endpoint_Selector_Factory.cpp: + * tao/Default_Stub_Factory.h: + * tao/Default_Stub_Factory.cpp: + * tao/Default_Thread_Lane_Resources_Manager.h: + * tao/Default_Thread_Lane_Resources_Manager.cpp: + * tao/DiffServPolicy/DiffServPolicy.h: + * tao/DiffServPolicy/DiffServPolicy.cpp: + * tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h: + * tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp: + * tao/DiffServPolicy/DiffServ_Protocols_Hooks.h: + * tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp: + * tao/DynamicAny/DynamicAny.h: + * tao/DynamicAny/DynamicAny.cpp: + * tao/EndpointPolicy/EndpointPolicy.h: + * tao/EndpointPolicy/EndpointPolicy.cpp: + * tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h: + * tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp: + * tao/FILE_Parser.h: + * tao/FILE_Parser.cpp: + * tao/HTTP_Parser.h: + * tao/HTTP_Parser.cpp: + * tao/IFR_Client/IFR_Client_Adapter_Impl.h: + * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp: + * tao/IIOP_Factory.h: + * tao/IIOP_Factory.cpp: + * tao/IORManipulation/IORManip_Loader.h: + * tao/IORManipulation/IORManip_Loader.cpp: + * tao/ImR_Client/ImR_Client.h: + * tao/ImR_Client/ImR_Client.cpp: + * tao/MCAST_Parser.h: + * tao/MCAST_Parser.cpp: + * tao/Messaging/AMI_Arguments_Converter_Impl.h: + * tao/Messaging/AMI_Arguments_Converter_Impl.cpp: + * tao/Messaging/Messaging_Loader.h: + * tao/Messaging/Messaging_Loader.cpp: + * tao/Monitor/Monitor.h: + * tao/Monitor/Monitor.cpp: + * tao/ORB_Core.h: + * tao/ORB_Core.cpp: + * tao/PI/ClientRequestInterceptor_Factory_Impl.h: + * tao/PI/ClientRequestInterceptor_Factory_Impl.cpp: + * tao/PI/ORBInitializer_Registry_Impl.h: + * tao/PI/ORBInitializer_Registry_Impl.cpp: + * tao/PI/PICurrent_Loader.h: + * tao/PI/PICurrent_Loader.cpp: + * tao/PI/PolicyFactory_Loader.h: + * tao/PI/PolicyFactory_Loader.cpp: + * tao/PI_Server/PI_Server_Loader.h: + * tao/PI_Server/PI_Server_Loader.cpp: + * tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h: + * tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp: + * tao/PortableServer/Acceptor_Filter_Factory.h: + * tao/PortableServer/Acceptor_Filter_Factory.cpp: + * tao/PortableServer/IdAssignmentStrategyFactoryImpl.h: + * tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp: + * tao/PortableServer/IdAssignmentStrategySystem.h: + * tao/PortableServer/IdAssignmentStrategySystem.cpp: + * tao/PortableServer/IdAssignmentStrategyUser.h: + * tao/PortableServer/IdAssignmentStrategyUser.cpp: + * tao/PortableServer/IdUniquenessStrategyFactoryImpl.h: + * tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp: + * tao/PortableServer/IdUniquenessStrategyMultiple.h: + * tao/PortableServer/IdUniquenessStrategyMultiple.cpp: + * tao/PortableServer/IdUniquenessStrategyUnique.h: + * tao/PortableServer/IdUniquenessStrategyUnique.cpp: + * tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h: + * tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp: + * tao/PortableServer/ImplicitActivationStrategyExplicit.h: + * tao/PortableServer/ImplicitActivationStrategyExplicit.cpp: + * tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h: + * tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp: + * tao/PortableServer/ImplicitActivationStrategyImplicit.h: + * tao/PortableServer/ImplicitActivationStrategyImplicit.cpp: + * tao/PortableServer/LifespanStrategyFactoryImpl.h: + * tao/PortableServer/LifespanStrategyFactoryImpl.cpp: + * tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h: + * tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp: + * tao/PortableServer/LifespanStrategyTransientFactoryImpl.h: + * tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp: + * tao/PortableServer/Network_Priority_Hook.h: + * tao/PortableServer/Network_Priority_Hook.cpp: + * tao/PortableServer/Object_Adapter_Factory.h: + * tao/PortableServer/Object_Adapter_Factory.cpp: + * tao/PortableServer/POA_Current_Factory.h: + * tao/PortableServer/POA_Current_Factory.cpp: + * tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h: + * tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp: + * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h: + * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp: + * tao/PortableServer/RequestProcessingStrategyFactoryImpl.h: + * tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp: + * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h: + * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp: + * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h: + * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp: + * tao/PortableServer/ServantRetentionStrategyFactoryImpl.h: + * tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp: + * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h: + * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp: + * tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h: + * tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp: + * tao/PortableServer/ThreadStrategyFactoryImpl.h: + * tao/PortableServer/ThreadStrategyFactoryImpl.cpp: + * tao/PortableServer/ThreadStrategyORBControl.h: + * tao/PortableServer/ThreadStrategyORBControl.cpp: + * tao/PortableServer/ThreadStrategySingle.h: + * tao/PortableServer/ThreadStrategySingle.cpp: + * tao/PortableServer/ThreadStrategySingleFactoryImpl.h: + * tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp: + * tao/RTCORBA/RT_Endpoint_Selector_Factory.h: + * tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp: + * tao/RTCORBA/RT_ORB_Loader.h: + * tao/RTCORBA/RT_ORB_Loader.cpp: + * tao/RTCORBA/RT_Protocols_Hooks.h: + * tao/RTCORBA/RT_Protocols_Hooks.cpp: + * tao/RTCORBA/RT_Stub_Factory.h: + * tao/RTCORBA/RT_Stub_Factory.cpp: + * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h: + * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp: + * tao/RTPortableServer/RT_Collocation_Resolver.h: + * tao/RTPortableServer/RT_Collocation_Resolver.cpp: + * tao/RTPortableServer/RT_Object_Adapter_Factory.h: + * tao/RTPortableServer/RT_Object_Adapter_Factory.cpp: + * tao/Strategies/COIOP_Factory.h: + * tao/Strategies/COIOP_Factory.cpp: + * tao/Strategies/DIOP_Factory.h: + * tao/Strategies/DIOP_Factory.cpp: + * tao/Strategies/OC_Endpoint_Selector_Factory.h: + * tao/Strategies/OC_Endpoint_Selector_Factory.cpp: + * tao/Strategies/SCIOP_Factory.h: + * tao/Strategies/SCIOP_Factory.cpp: + * tao/Strategies/SHMIOP_Factory.h: + * tao/Strategies/SHMIOP_Factory.cpp: + * tao/Strategies/UIOP_Factory.h: + * tao/Strategies/UIOP_Factory.cpp: + * tao/Strategies/advanced_resource.h: + * tao/Strategies/advanced_resource.cpp: + * tao/TransportCurrent/Current_Loader.h: + * tao/TransportCurrent/IIOP_Current_Loader.h: + * tao/TransportCurrent/IIOP_Current_Loader.cpp: + * tao/Valuetype/Valuetype_Adapter_Factory_Impl.h: + * tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp: + * tao/ZIOP/ZIOP.h: + * tao/ZIOP/ZIOP.cpp: + * tao/ZIOP/ZIOP_Stub_Factory.h: + * tao/ZIOP/ZIOP_Stub_Factory.cpp: + * tao/default_client.h: + * tao/default_client.cpp: + * tao/default_resource.h: + * tao/default_resource.cpp: + * tao/default_server.h: + * tao/default_server.cpp: + + Enclosed service declarations/definitions and factory functions in versioned + namespace markers to better able handle mixing versioned and unversioned + compilations working together in shared namespaces. + Fri Jan 30 14:10:14 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * tao/CDR.inl: diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index 86a170d7639..b23dc8ee50d 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp @@ -177,7 +177,6 @@ TAO_AnyTypeCode_Adapter_Impl::Initializer (void) ); } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( TAO_AnyTypeCode_Adapter_Impl, @@ -189,4 +188,5 @@ ACE_STATIC_SVC_DEFINE ( ACE_FACTORY_DEFINE (TAO_AnyTypeCode, TAO_AnyTypeCode_Adapter_Impl) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h index 389623b086c..24273e69b4b 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h @@ -123,7 +123,6 @@ ANYTYPECODE__EXCEPTION_LIST virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_boolean value); }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_AnyTypeCode_Adapter_Impl) ACE_FACTORY_DECLARE (TAO_AnyTypeCode, TAO_AnyTypeCode_Adapter_Impl) @@ -131,5 +130,9 @@ ACE_FACTORY_DECLARE (TAO_AnyTypeCode, TAO_AnyTypeCode_Adapter_Impl) static int TAO_Requires_TAO_AnyTypeCode_Adapter_Impl = TAO_AnyTypeCode_Adapter_Impl::Initializer (); +TAO_END_VERSIONED_NAMESPACE_DECL + + + #include /**/ "ace/post.h" #endif /* TAO_ANYTYPECODE_ADAPTER_IMPL_H */ diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp index 76ad1e75852..3140fa86b34 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp @@ -68,7 +68,6 @@ TAO_NVList_Adapter_Impl::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_NVList_Adapter_Impl); } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_NVList_Adapter_Impl, ACE_TEXT ("TAO_NVList_Adapter"), @@ -77,3 +76,4 @@ ACE_STATIC_SVC_DEFINE (TAO_NVList_Adapter_Impl, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO_AnyTypeCode, TAO_NVList_Adapter_Impl) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h index 0699756772e..2ad30a4a43d 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h @@ -44,11 +44,11 @@ public: static int TAO_Requires_NVList_Adapter_Impl_Initializer = TAO_NVList_Adapter_Impl::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_NVList_Adapter_Impl) ACE_FACTORY_DECLARE (TAO_AnyTypeCode, TAO_NVList_Adapter_Impl) +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_NVLIST_ADAPTER_IMPL_H */ diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp index 6f37d0bd707..679c2e4bf69 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp @@ -96,7 +96,6 @@ TAO_BiDirGIOP_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_BiDirGIOP_Loader); } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_BiDirGIOP_Loader, ACE_TEXT ("BiDirGIOP_Loader"), @@ -106,3 +105,5 @@ ACE_STATIC_SVC_DEFINE (TAO_BiDirGIOP_Loader, 0) ACE_FACTORY_DEFINE (TAO_BiDirGIOP, TAO_BiDirGIOP_Loader) + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h index b2487dfa1da..b3b9a5c8359 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h @@ -67,11 +67,12 @@ private: static bool TAO_Requires_BiDirGIOP_Initializer = TAO_BiDirGIOP_Loader::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_BiDirGIOP_Loader) ACE_FACTORY_DECLARE (TAO_BiDirGIOP, TAO_BiDirGIOP_Loader) +TAO_END_VERSIONED_NAMESPACE_DECL + #define TAO_BIDIRGIOP_SAFE_INCLUDE #include "tao/BiDir_GIOP/BiDirPolicyC.h" diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index a3a54b57559..ef74e74768d 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -349,7 +349,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, canonical_endpoint += raw_port; } -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_CORBALOC_Parser, ACE_TEXT ("CORBALOC_Parser"), @@ -361,4 +361,6 @@ ACE_STATIC_SVC_DEFINE (TAO_CORBALOC_Parser, ACE_FACTORY_DEFINE (TAO, TAO_CORBALOC_Parser) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBALOC_PARSER == 1 */ diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h index 3491fc389ef..5bebf98e3ec 100644 --- a/TAO/tao/CORBALOC_Parser.h +++ b/TAO/tao/CORBALOC_Parser.h @@ -91,15 +91,15 @@ private: }; }; +ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_CORBALOC_Parser) +ACE_FACTORY_DECLARE (TAO, TAO_CORBALOC_Parser) + TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/CORBALOC_Parser.inl" #endif /* __ACE_INLINE__ */ -ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_CORBALOC_Parser) -ACE_FACTORY_DECLARE (TAO, TAO_CORBALOC_Parser) - #endif /* TAO_HAS_CORBALOC_PARSER == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index 4de2bf7ae90..37b9bee2adc 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -145,7 +145,6 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb) return obj; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_CORBANAME_Parser, ACE_TEXT ("CORBANAME_Parser"), @@ -157,5 +156,7 @@ ACE_STATIC_SVC_DEFINE (TAO_CORBANAME_Parser, ACE_FACTORY_DEFINE (TAO, TAO_CORBANAME_Parser) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBANAME_PARSER == 1 */ diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h index c656296661f..260aeea4be5 100644 --- a/TAO/tao/CORBANAME_Parser.h +++ b/TAO/tao/CORBANAME_Parser.h @@ -58,11 +58,12 @@ public: ); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_CORBANAME_Parser) ACE_FACTORY_DECLARE (TAO, TAO_CORBANAME_Parser) +TAO_END_VERSIONED_NAMESPACE_DECL + + #endif /* TAO_HAS_CORBANAME_PARSER == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp index 3027b765575..97771f3b9cb 100644 --- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp +++ b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp @@ -98,7 +98,6 @@ TAO_CSD_Framework_Loader::init (int, ACE_TCHAR* []) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////////////////////// @@ -110,3 +109,4 @@ ACE_STATIC_SVC_DEFINE (TAO_CSD_Framework_Loader, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h b/TAO/tao/CSD_Framework/CSD_Framework_Loader.h index 2718424f3ce..c648910a5e6 100644 --- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h +++ b/TAO/tao/CSD_Framework/CSD_Framework_Loader.h @@ -52,10 +52,11 @@ class TAO_CSD_FW_Export TAO_CSD_Framework_Loader : public ACE_Service_Object virtual int init (int argc, ACE_TCHAR* []); }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_CSD_FW, TAO_CSD_Framework_Loader) ACE_FACTORY_DECLARE (TAO_CSD_FW, TAO_CSD_Framework_Loader) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CSD_FRAMEWORK_LOADER_H */ diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp index 3dae3d33cf3..d62b5e0928f 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp @@ -52,7 +52,6 @@ TAO_CSD_Object_Adapter_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ []) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_DEFINE (TAO_CSD_FW, TAO_CSD_Object_Adapter_Factory) ACE_STATIC_SVC_DEFINE (TAO_CSD_Object_Adapter_Factory, @@ -61,3 +60,4 @@ ACE_STATIC_SVC_DEFINE (TAO_CSD_Object_Adapter_Factory, &ACE_SVC_NAME (TAO_CSD_Object_Adapter_Factory), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h index cda859315bf..c3340a9851a 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h @@ -41,10 +41,11 @@ public: ACE_TCHAR* argv[]); }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_CSD_FW, TAO_CSD_Object_Adapter_Factory) ACE_FACTORY_DECLARE (TAO_CSD_FW, TAO_CSD_Object_Adapter_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CSD_OBJECT_ADAPTER_FACTORY_H */ diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp index 5a169516bf5..d1e3b0c1c9a 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp @@ -103,7 +103,6 @@ TAO_CSD_Strategy_Repository::Strategy_Node::find(const ACE_CString &name) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////////////////////// @@ -115,3 +114,4 @@ ACE_STATIC_SVC_DEFINE (TAO_CSD_Strategy_Repository, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h index 7e50fe5f62f..134ae85410d 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h @@ -68,11 +68,12 @@ private: Strategy_Node * strategy_list_head_; }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_CSD_FW, TAO_CSD_Strategy_Repository) ACE_FACTORY_DECLARE (TAO_CSD_FW, TAO_CSD_Strategy_Repository) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CSD_STRATEGY_FACTORY_H */ diff --git a/TAO/tao/CodecFactory/CodecFactory.cpp b/TAO/tao/CodecFactory/CodecFactory.cpp index 21e34543ebc..f567c008cc7 100644 --- a/TAO/tao/CodecFactory/CodecFactory.cpp +++ b/TAO/tao/CodecFactory/CodecFactory.cpp @@ -36,8 +36,6 @@ TAO_CodecFactory_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_CodecFactory_Loader); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_CodecFactory_Loader, ACE_TEXT ("CodecFactory_Loader"), ACE_SVC_OBJ_T, @@ -45,3 +43,6 @@ ACE_STATIC_SVC_DEFINE (TAO_CodecFactory_Loader, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO_CodecFactory, TAO_CodecFactory_Loader) + +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h index 19c641fa948..290d2455191 100644 --- a/TAO/tao/CodecFactory/CodecFactory.h +++ b/TAO/tao/CodecFactory/CodecFactory.h @@ -47,11 +47,12 @@ public: static int TAO_Requires_CodecFactory_Initializer = TAO_CodecFactory_Loader::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_CodecFactory_Loader) ACE_FACTORY_DECLARE (TAO_CodecFactory, TAO_CodecFactory_Loader) +TAO_END_VERSIONED_NAMESPACE_DECL + + #include /**/ "ace/post.h" #endif /* TAO_CODECFACTORY_H */ diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp index fc476c15e4c..a4fab0e4d70 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp @@ -39,8 +39,6 @@ TAO_Codeset_Manager_Factory::create (void) return csm; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_Codeset, TAO_Codeset_Manager_Factory) ACE_STATIC_SVC_DEFINE (TAO_Codeset_Manager_Factory, ACE_TEXT ("TAO_Codeset"), @@ -48,3 +46,5 @@ ACE_STATIC_SVC_DEFINE (TAO_Codeset_Manager_Factory, &ACE_SVC_NAME (TAO_Codeset_Manager_Factory), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.h b/TAO/tao/Codeset/Codeset_Manager_Factory.h index 44ed6f20d8c..d645beca3f5 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.h +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.h @@ -47,11 +47,11 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_Codeset_Manager_Factory) ACE_FACTORY_DECLARE (TAO_Codeset, TAO_Codeset_Manager_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp index 4798a1f84d4..64123cd9130 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp @@ -20,6 +20,8 @@ #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_UTF16_BOM_Factory, ACE_TEXT ("UTF16_BOM_Factory"), ACE_SVC_OBJ_T, @@ -30,7 +32,6 @@ ACE_STATIC_SVC_DEFINE (TAO_UTF16_BOM_Factory, ACE_FACTORY_DEFINE (TAO_Codeset, TAO_UTF16_BOM_Factory) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UTF16_BOM_Factory::TAO_UTF16_BOM_Factory () : translator_ (0) diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.h b/TAO/tao/Codeset/UTF16_BOM_Factory.h index d499744e9f6..add00a67c23 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Factory.h +++ b/TAO/tao/Codeset/UTF16_BOM_Factory.h @@ -59,10 +59,10 @@ private: bool forceBE_; // force big endian wchar, warray, & wstring }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Codeset, TAO_UTF16_BOM_Factory) ACE_FACTORY_DECLARE (TAO_Codeset, TAO_UTF16_BOM_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* UTF16_BOM_FACTORY_H */ diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp index 2298e093c7d..604167f74b4 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp @@ -4,6 +4,8 @@ #include "ace/Log_Msg.h" #include "tao/Codeset/UTF8_Latin1_Factory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_UTF8_Latin1_Factory, ACE_TEXT ("UTF8_Latin1_Factory"), ACE_SVC_OBJ_T, @@ -13,7 +15,6 @@ ACE_STATIC_SVC_DEFINE (TAO_UTF8_Latin1_Factory, 0) ACE_FACTORY_DEFINE (TAO_Codeset, TAO_UTF8_Latin1_Factory) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UTF8_Latin1_Factory::TAO_UTF8_Latin1_Factory() : translator_ (0) diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.h b/TAO/tao/Codeset/UTF8_Latin1_Factory.h index 292333ad7e0..73ef2ff651b 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Factory.h +++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.h @@ -44,10 +44,10 @@ private: TAO_UTF8_Latin1_Translator *translator_; }; -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Codeset, TAO_UTF8_Latin1_Factory) ACE_FACTORY_DECLARE (TAO_Codeset, TAO_UTF8_Latin1_Factory) - +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* UTF8_LATIN1_FACTORY_H */ diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp index 96a37e46d02..f898c3bfe53 100644 --- a/TAO/tao/Codeset_Manager_Factory_Base.cpp +++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp @@ -34,8 +34,6 @@ TAO_Codeset_Manager_Factory_Base::initialize (void) (ace_svc_desc_TAO_Codeset_Manager_Factory_Base); } -TAO_END_VERSIONED_NAMESPACE_DECL - #if 0 static int TAO_Requires_Codeset_Manager_Factory_Base = @@ -49,3 +47,6 @@ ACE_STATIC_SVC_DEFINE (TAO_Codeset_Manager_Factory_Base, &ACE_SVC_NAME (TAO_Codeset_Manager_Factory_Base), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) + +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/Codeset_Manager_Factory_Base.h b/TAO/tao/Codeset_Manager_Factory_Base.h index bbd82d40c45..6f658f6d0ec 100644 --- a/TAO/tao/Codeset_Manager_Factory_Base.h +++ b/TAO/tao/Codeset_Manager_Factory_Base.h @@ -67,11 +67,11 @@ static int TAO_Requires_Base_Codeset_Initializer = TAO_Codeset_Manager_Factory_Base::initialize (); -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_Codeset_Manager_Factory_Base) ACE_FACTORY_DECLARE (TAO, TAO_Codeset_Manager_Factory_Base) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CODESET_MANAGER_FACTORY_BASE_H */ diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp index 8ce27e23b0b..d2b4bba59bd 100644 --- a/TAO/tao/DLL_Parser.cpp +++ b/TAO/tao/DLL_Parser.cpp @@ -63,7 +63,6 @@ TAO_DLL_Parser::parse_string (const char *ior, return loader->create_object (orb, 0, 0); } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_DLL_Parser, ACE_TEXT ("DLL_Parser"), @@ -76,4 +75,6 @@ ACE_STATIC_SVC_DEFINE (TAO_DLL_Parser, ACE_FACTORY_DEFINE (TAO, TAO_DLL_Parser) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_DDL_PARSER == 1 */ diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h index c66e5e32967..61795f7547a 100644 --- a/TAO/tao/DLL_Parser.h +++ b/TAO/tao/DLL_Parser.h @@ -91,11 +91,11 @@ public: CORBA::ORB_ptr orb); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_DLL_Parser) ACE_FACTORY_DECLARE (TAO, TAO_DLL_Parser) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_DDL_PARSER == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp index 05209f896a0..72e16367826 100644 --- a/TAO/tao/Default_Collocation_Resolver.cpp +++ b/TAO/tao/Default_Collocation_Resolver.cpp @@ -17,8 +17,6 @@ TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object) const return object->_is_collocated (); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_Default_Collocation_Resolver, ACE_TEXT ("Default_Collocation_Resolver"), ACE_SVC_OBJ_T, @@ -26,3 +24,6 @@ ACE_STATIC_SVC_DEFINE (TAO_Default_Collocation_Resolver, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO, TAO_Default_Collocation_Resolver) + +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h index 31394883da1..fb010de359a 100644 --- a/TAO/tao/Default_Collocation_Resolver.h +++ b/TAO/tao/Default_Collocation_Resolver.h @@ -43,11 +43,11 @@ public: ) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Collocation_Resolver) ACE_FACTORY_DECLARE (TAO, TAO_Default_Collocation_Resolver) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_DEFAULT_COLLOCATION_RESOLVER_H */ diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp index 031eec86c95..8f64a7f6bb3 100644 --- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp @@ -32,8 +32,6 @@ TAO_Default_Endpoint_Selector_Factory::get_selector (void) return this->default_endpoint_selector_; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Default_Endpoint_Selector_Factory, @@ -43,3 +41,6 @@ ACE_STATIC_SVC_DEFINE (TAO_Default_Endpoint_Selector_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO, TAO_Default_Endpoint_Selector_Factory) + +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h index ac5f7c46e83..f6067d196f0 100644 --- a/TAO/tao/Default_Endpoint_Selector_Factory.h +++ b/TAO/tao/Default_Endpoint_Selector_Factory.h @@ -78,10 +78,10 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Endpoint_Selector_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Endpoint_Selector_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_DEFAULT_ENDPOINT_SELECTOR_FACTORY_H */ diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp index d7b609db5b4..03916e10364 100644 --- a/TAO/tao/Default_Stub_Factory.cpp +++ b/TAO/tao/Default_Stub_Factory.cpp @@ -32,8 +32,6 @@ TAO_Default_Stub_Factory::create_stub (const char *repository_id, return retval; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE ( @@ -45,3 +43,6 @@ ACE_STATIC_SVC_DEFINE ( 0 ) ACE_FACTORY_DEFINE (TAO, TAO_Default_Stub_Factory) + +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/Default_Stub_Factory.h b/TAO/tao/Default_Stub_Factory.h index a4e26ccf0a5..99df71d64bf 100644 --- a/TAO/tao/Default_Stub_Factory.h +++ b/TAO/tao/Default_Stub_Factory.h @@ -51,11 +51,11 @@ public: TAO_ORB_Core *orb_core); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Stub_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Stub_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_DEFAULT_STUB_FACTORY_H_ */ diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp index 94edfb8f666..534012c5379 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp @@ -103,9 +103,6 @@ TAO_Default_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_ // ------------------------------------------------------- -TAO_END_VERSIONED_NAMESPACE_DECL - - ACE_STATIC_SVC_DEFINE (TAO_Default_Thread_Lane_Resources_Manager_Factory, ACE_TEXT ("Default_Thread_Lane_Resources_Manager_Factory"), ACE_SVC_OBJ_T, @@ -113,3 +110,7 @@ ACE_STATIC_SVC_DEFINE (TAO_Default_Thread_Lane_Resources_Manager_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory) + +TAO_END_VERSIONED_NAMESPACE_DECL + + diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h index cbeb44fd9df..a0f71ba39b9 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h @@ -101,11 +101,11 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_DEFAULT_THREAD_LANE_RESOURCES_MANAGER_H */ diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy.cpp index 9ebc0a43378..f83f8c80b00 100644 --- a/TAO/tao/DiffServPolicy/DiffServPolicy.cpp +++ b/TAO/tao/DiffServPolicy/DiffServPolicy.cpp @@ -57,7 +57,6 @@ TAO_DiffServPolicy_Initializer::init (int, ACE_TCHAR* []) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////////////////////// @@ -69,3 +68,4 @@ ACE_STATIC_SVC_DEFINE (TAO_DiffServPolicy_Initializer, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.h b/TAO/tao/DiffServPolicy/DiffServPolicy.h index 1794ee7d27d..72e8a6b6085 100644 --- a/TAO/tao/DiffServPolicy/DiffServPolicy.h +++ b/TAO/tao/DiffServPolicy/DiffServPolicy.h @@ -43,10 +43,11 @@ static int TAO_Requires_DiffServPolicy_Initializer = TAO_DiffServPolicy_Initializer::static_init (); -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_DiffServPolicy, TAO_DiffServPolicy_Initializer) ACE_FACTORY_DECLARE (TAO_DiffServPolicy, TAO_DiffServPolicy_Initializer) +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp index 888eaf60a55..7a6c46706c8 100644 --- a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp +++ b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp @@ -94,7 +94,6 @@ TAO_DiffServ_Network_Priority_Hook::set_dscp_codepoint ( connection_handler->set_dscp_codepoint (dscp_codepoint); } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_DEFINE (TAO_DiffServPolicy, TAO_DiffServ_Network_Priority_Hook) ACE_STATIC_SVC_DEFINE (TAO_DiffServ_Network_Priority_Hook, @@ -104,3 +103,4 @@ ACE_STATIC_SVC_DEFINE (TAO_DiffServ_Network_Priority_Hook, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h index fc9a7e98a6d..2da10eedf3b 100644 --- a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h +++ b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h @@ -48,12 +48,13 @@ public: TAO_Root_POA &poa); }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_DiffServPolicy, TAO_DiffServ_Network_Priority_Hook) ACE_FACTORY_DECLARE (TAO_DiffServPolicy, TAO_DiffServ_Network_Priority_Hook) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" diff --git a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp index b831eb3eeef..117e4757961 100644 --- a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp +++ b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp @@ -180,7 +180,6 @@ TAO_DS_Network_Priority_Protocols_Hooks::get_dscp_codepoint ( return dscp; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_DS_Network_Priority_Protocols_Hooks, ACE_TEXT ("DS_Network_Priority_Protocols_Hooks"), @@ -191,3 +190,4 @@ ACE_STATIC_SVC_DEFINE (TAO_DS_Network_Priority_Protocols_Hooks, 0) ACE_FACTORY_DEFINE (TAO_DiffServPolicy, TAO_DS_Network_Priority_Protocols_Hooks) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h index 559fd4d8b4a..9e935fac90e 100644 --- a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h +++ b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h @@ -80,12 +80,12 @@ protected: TAO_ORB_Core *orb_core_; }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_DiffServPolicy, TAO_DS_Network_Priority_Protocols_Hooks) ACE_FACTORY_DECLARE (TAO_DiffServPolicy, TAO_DS_Network_Priority_Protocols_Hooks) +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_DIFFSERV_PROTOCOLS_HOOKS_H */ diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp index 947f67c30c6..a1686020897 100644 --- a/TAO/tao/DynamicAny/DynamicAny.cpp +++ b/TAO/tao/DynamicAny/DynamicAny.cpp @@ -38,7 +38,6 @@ TAO_DynamicAny_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_DynamicAny_Loader); } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_DynamicAny_Loader, ACE_TEXT ("DynamicAny_Loader"), @@ -47,3 +46,5 @@ ACE_STATIC_SVC_DEFINE (TAO_DynamicAny_Loader, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO_DynamicAny, TAO_DynamicAny_Loader) + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h index 4f75403d742..71a0564d5eb 100644 --- a/TAO/tao/DynamicAny/DynamicAny.h +++ b/TAO/tao/DynamicAny/DynamicAny.h @@ -48,10 +48,11 @@ public: static int TAO_Requires_DynamicAny_Initializer = TAO_DynamicAny_Loader::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_DynamicAny_Loader) ACE_FACTORY_DECLARE (TAO_DynamicAny, TAO_DynamicAny_Loader) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_DYNAMICANY_H */ diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp index 3c9282928c4..f1b7ccbdec7 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp @@ -58,7 +58,6 @@ TAO_EndpointPolicy_Initializer::init (int, ACE_TCHAR* []) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////////////////////// @@ -70,3 +69,4 @@ ACE_STATIC_SVC_DEFINE (TAO_EndpointPolicy_Initializer, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.h b/TAO/tao/EndpointPolicy/EndpointPolicy.h index e66480a5dc4..8529d65f59d 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy.h @@ -41,11 +41,12 @@ public: static int TAO_Requires_EndpointPolicy_Initializer = TAO_EndpointPolicy_Initializer::static_init (); -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_EndpointPolicy, TAO_EndpointPolicy_Initializer) ACE_FACTORY_DECLARE (TAO_EndpointPolicy, TAO_EndpointPolicy_Initializer) +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #define TAO_ENDPOINTPOLICY_SAFE_INCLUDE diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp index 68d7657c68c..561b045e96f 100644 --- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp +++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp @@ -61,7 +61,6 @@ TAO_Endpoint_Acceptor_Filter_Factory::~TAO_Endpoint_Acceptor_Filter_Factory(void } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_DEFINE (TAO_EndpointPolicy, TAO_Endpoint_Acceptor_Filter_Factory) ACE_STATIC_SVC_DEFINE (TAO_Endpoint_Acceptor_Filter_Factory, @@ -71,3 +70,4 @@ ACE_STATIC_SVC_DEFINE (TAO_Endpoint_Acceptor_Filter_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h index 54a61c45c93..124aa886c4b 100644 --- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h +++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h @@ -45,11 +45,12 @@ public: TAO_Acceptor_Filter* create_object (TAO_POA_Manager& poamanager); }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_EndpointPolicy, TAO_Endpoint_Acceptor_Filter_Factory) ACE_FACTORY_DECLARE (TAO_EndpointPolicy, TAO_Endpoint_Acceptor_Filter_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index ac6bc32c4a3..643675b466a 100644 --- a/TAO/tao/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -71,7 +71,6 @@ TAO_FILE_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb) return object; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_FILE_Parser, ACE_TEXT ("FILE_Parser"), @@ -83,5 +82,7 @@ ACE_STATIC_SVC_DEFINE (TAO_FILE_Parser, ACE_FACTORY_DEFINE (TAO, TAO_FILE_Parser) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_FILE_PARSER == 1 */ diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h index fb933d788b8..2cd7b39253f 100644 --- a/TAO/tao/FILE_Parser.h +++ b/TAO/tao/FILE_Parser.h @@ -50,11 +50,11 @@ public: virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_FILE_Parser) ACE_FACTORY_DECLARE (TAO, TAO_FILE_Parser) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_FILE_PARSER == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp index f46e75376df..50ed7114ec0 100644 --- a/TAO/tao/HTTP_Parser.cpp +++ b/TAO/tao/HTTP_Parser.cpp @@ -126,8 +126,6 @@ TAO_HTTP_Parser::parse_string (const char *nior, return orb->string_to_object (string.c_str()); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_HTTP_Parser, ACE_TEXT ("HTTP_Parser"), ACE_SVC_OBJ_T, @@ -138,4 +136,7 @@ ACE_STATIC_SVC_DEFINE (TAO_HTTP_Parser, ACE_FACTORY_DEFINE (TAO, TAO_HTTP_Parser) +TAO_END_VERSIONED_NAMESPACE_DECL + + #endif /* TAO_HAS_HTTP_PARSER == 1 */ diff --git a/TAO/tao/HTTP_Parser.h b/TAO/tao/HTTP_Parser.h index 1504f7caf39..c681192b458 100644 --- a/TAO/tao/HTTP_Parser.h +++ b/TAO/tao/HTTP_Parser.h @@ -51,11 +51,11 @@ public: virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_HTTP_Parser) ACE_FACTORY_DECLARE (TAO, TAO_HTTP_Parser) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_HTTP_PARSER == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp index b027a4dcee3..04e9b6768cb 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp @@ -203,7 +203,6 @@ TAO_IFR_Client_Adapter_Impl::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_IFR_Client_Adapter_Impl); } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( TAO_IFR_Client_Adapter_Impl, @@ -215,3 +214,4 @@ ACE_STATIC_SVC_DEFINE ( ) ACE_FACTORY_DEFINE (TAO_IFR_Client, TAO_IFR_Client_Adapter_Impl) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h index 06deb8c9d07..5cca998b2ea 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h @@ -85,10 +85,10 @@ static int TAO_Requires_IFR_Client_Initializer = TAO_IFR_Client_Adapter_Impl::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_IFR_Client_Adapter_Impl) ACE_FACTORY_DECLARE (TAO_IFR_Client, TAO_IFR_Client_Adapter_Impl) +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp index db29fb71c18..94d1fe77543 100644 --- a/TAO/tao/IIOP_Factory.cpp +++ b/TAO/tao/IIOP_Factory.cpp @@ -80,8 +80,6 @@ TAO_IIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_IIOP_Protocol_Factory, ACE_TEXT ("IIOP_Factory"), ACE_SVC_OBJ_T, @@ -92,4 +90,7 @@ ACE_STATIC_SVC_DEFINE (TAO_IIOP_Protocol_Factory, ACE_FACTORY_DEFINE (TAO, TAO_IIOP_Protocol_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + + #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h index 46051c422cd..6422949616c 100644 --- a/TAO/tao/IIOP_Factory.h +++ b/TAO/tao/IIOP_Factory.h @@ -58,11 +58,11 @@ public: virtual int requires_explicit_endpoint (void) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Protocol_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp index 05e766c4905..90bfb074d04 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.cpp +++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp @@ -31,7 +31,6 @@ TAO_IORManip_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_IORManip_Loader); } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_IORManip_Loader, ACE_TEXT ("IORManip_Loader"), @@ -40,3 +39,5 @@ ACE_STATIC_SVC_DEFINE (TAO_IORManip_Loader, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO_IORManip, TAO_IORManip_Loader) + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h index e4f32a91866..5ec5068fce0 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.h +++ b/TAO/tao/IORManipulation/IORManip_Loader.h @@ -44,11 +44,12 @@ public: static int TAO_Requires_IORManip_Initializer = TAO_IORManip_Loader::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_IORManip_Loader) ACE_FACTORY_DECLARE (TAO_IORManip, TAO_IORManip_Loader) +TAO_END_VERSIONED_NAMESPACE_DECL + #define TAO_IORMANIP_SAFE_INCLUDE #include "tao/IORManipulation/IORC.h" #undef TAO_IORMANIP_SAFE_INCLUDE diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp index 0657e544195..084e493427e 100644 --- a/TAO/tao/ImR_Client/ImR_Client.cpp +++ b/TAO/tao/ImR_Client/ImR_Client.cpp @@ -227,8 +227,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE ( ImR_Client_Adapter_Impl, ACE_TEXT ("Concrete_ImR_Client_Adapter"), @@ -241,3 +239,6 @@ ACE_FACTORY_NAMESPACE_DEFINE ( TAO_IMR_Client, ImR_Client_Adapter_Impl, TAO::ImR_Client::ImR_Client_Adapter_Impl) + +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/ImR_Client/ImR_Client.h b/TAO/tao/ImR_Client/ImR_Client.h index e7bc661c089..ed270a2af03 100644 --- a/TAO/tao/ImR_Client/ImR_Client.h +++ b/TAO/tao/ImR_Client/ImR_Client.h @@ -70,11 +70,12 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (ImR_Client_Adapter_Impl) ACE_FACTORY_DECLARE (TAO_IMR_Client, ImR_Client_Adapter_Impl) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IMR_CLIENT_ADAPTER_IMPL_H */ diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index 3ceb1565c86..722b30fa65b 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -478,8 +478,6 @@ TAO_MCAST_Parser::assign_to_variables (char const * mcast_name) mcast_name_cstring.substring (1, mcast_name_cstring.length() - 1).c_str (); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_MCAST_Parser, ACE_TEXT ("MCAST_Parser"), ACE_SVC_OBJ_T, @@ -490,4 +488,7 @@ ACE_STATIC_SVC_DEFINE (TAO_MCAST_Parser, ACE_FACTORY_DEFINE (TAO, TAO_MCAST_Parser) +TAO_END_VERSIONED_NAMESPACE_DECL + + #endif /* TAO_HAS_MCAST_PARSER == 1 */ diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h index 83b9a5b3cda..ab13fd43f2e 100644 --- a/TAO/tao/MCAST_Parser.h +++ b/TAO/tao/MCAST_Parser.h @@ -96,15 +96,15 @@ private: }; +ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_MCAST_Parser) +ACE_FACTORY_DECLARE (TAO, TAO_MCAST_Parser) + TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/MCAST_Parser.inl" #endif /* __ACE_INLINE__ */ -ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_MCAST_Parser) -ACE_FACTORY_DECLARE (TAO, TAO_MCAST_Parser) - #endif /* TAO_HAS_MCAST_PARSER == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp index b70839ad961..021fcc69a3b 100644 --- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp +++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp @@ -129,7 +129,6 @@ TAO_AMI_Arguments_Converter_Impl::Initializer (void) } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( TAO_AMI_Arguments_Converter_Impl, @@ -142,3 +141,4 @@ ACE_STATIC_SVC_DEFINE ( ACE_FACTORY_DEFINE (TAO_Messaging, TAO_AMI_Arguments_Converter_Impl) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h index 8745bf809ab..4d6599aaf2b 100644 --- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h +++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h @@ -67,11 +67,12 @@ static int TAO_Requires_AMI_Arguments_Converter_Impl_Initializer = TAO_AMI_Arguments_Converter_Impl::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_AMI_Arguments_Converter_Impl) ACE_FACTORY_DECLARE (TAO_Messaging, TAO_AMI_Arguments_Converter_Impl) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp index 2a1e975158f..eaa84728fc2 100644 --- a/TAO/tao/Messaging/Messaging_Loader.cpp +++ b/TAO/tao/Messaging/Messaging_Loader.cpp @@ -66,7 +66,6 @@ TAO_Messaging_Loader::init (int, return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////////////////////// @@ -78,3 +77,5 @@ ACE_STATIC_SVC_DEFINE (TAO_Messaging_Loader, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_Loader.h b/TAO/tao/Messaging/Messaging_Loader.h index 8a3d8ae118c..ca63954f8bd 100644 --- a/TAO/tao/Messaging/Messaging_Loader.h +++ b/TAO/tao/Messaging/Messaging_Loader.h @@ -40,10 +40,11 @@ public: virtual int init (int argc, ACE_TCHAR* []); }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Messaging, TAO_Messaging_Loader) ACE_FACTORY_DECLARE (TAO_Messaging, TAO_Messaging_Loader) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_MESSAGING_LOADER_H */ diff --git a/TAO/tao/Monitor/Monitor.cpp b/TAO/tao/Monitor/Monitor.cpp index 358e5d3eb32..78109cd7f5a 100644 --- a/TAO/tao/Monitor/Monitor.cpp +++ b/TAO/tao/Monitor/Monitor.cpp @@ -60,7 +60,6 @@ TAO_Monitor_Init::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Monitor_Init); } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_Monitor_Init, ACE_TEXT ("Monitor_Init"), @@ -70,5 +69,7 @@ ACE_STATIC_SVC_DEFINE (TAO_Monitor_Init, 0) ACE_FACTORY_DEFINE (TAO_Monitor, TAO_Monitor_Init) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ diff --git a/TAO/tao/Monitor/Monitor.h b/TAO/tao/Monitor/Monitor.h index 9a6d1a9a771..3e2ad6c4055 100644 --- a/TAO/tao/Monitor/Monitor.h +++ b/TAO/tao/Monitor/Monitor.h @@ -53,10 +53,10 @@ static int TAO_Requires_Monitor_Initializer = TAO_Monitor_Init::Initializer (); //#endif /* TAO_AS_STATIC_LIBS */ -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_Monitor_Init) ACE_FACTORY_DECLARE (TAO_Monitor, TAO_Monitor_Init) +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index ec7c7ae2248..8581111e916 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -79,6 +79,8 @@ # include "tao/ORB_Core.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_RCSID (tao, ORB_Core, "$Id$") @@ -91,8 +93,6 @@ ACE_STATIC_SVC_DEFINE(TAO_ORB_Core_Static_Resources, 0) ACE_FACTORY_DEFINE (TAO, TAO_ORB_Core_Static_Resources) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // **************************************************************** CORBA::Environment& diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index d228ff0d7c9..b2f3d7172a3 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -1376,11 +1376,11 @@ TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance (void); // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_ORB_Core_Static_Resources) ACE_FACTORY_DECLARE (TAO, TAO_ORB_Core_Static_Resources) +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/ORB_Core.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp index e4ff27b2c9b..6fe13dd9284 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp @@ -36,7 +36,6 @@ 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"), @@ -46,4 +45,6 @@ ACE_STATIC_SVC_DEFINE (TAO_ClientRequestInterceptor_Adapter_Factory_Impl, 0) ACE_FACTORY_DEFINE (TAO_PI, TAO_ClientRequestInterceptor_Adapter_Factory_Impl) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h index f63b6ca3407..96c9f4c85e6 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h @@ -43,11 +43,12 @@ 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) +TAO_END_VERSIONED_NAMESPACE_DECL + + #endif /* TAO_HAS_INTERCEPTORS == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp index c457173f0d6..c95b18f1bd0 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp @@ -241,8 +241,6 @@ TAO::ORBInitializer_Registry::post_init ( } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (ORBInitializer_Registry, ACE_TEXT ("ORBInitializer_Registry"), ACE_SVC_OBJ_T, @@ -251,3 +249,6 @@ ACE_STATIC_SVC_DEFINE (ORBInitializer_Registry, 0) ACE_FACTORY_NAMESPACE_DEFINE (TAO_PI, ORBInitializer_Registry, TAO::ORBInitializer_Registry) + +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h index abca05f343e..b058b288e05 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h @@ -94,11 +94,12 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (ORBInitializer_Registry) ACE_FACTORY_DECLARE (TAO_PI, ORBInitializer_Registry) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PI_ORB_INITIALIZER_REGISTRY_IMPL_H */ diff --git a/TAO/tao/PI/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp index e75f088da48..804a577a4e3 100644 --- a/TAO/tao/PI/PICurrent_Loader.cpp +++ b/TAO/tao/PI/PICurrent_Loader.cpp @@ -37,7 +37,6 @@ TAO_PICurrent_Loader::create_object (CORBA::ORB_ptr orb, int, ACE_TCHAR *[]) return obj; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_PICurrent_Loader, ACE_TEXT ("PICurrent_Loader"), @@ -47,4 +46,6 @@ ACE_STATIC_SVC_DEFINE (TAO_PICurrent_Loader, 0) ACE_FACTORY_DEFINE (TAO_PI, TAO_PICurrent_Loader) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h index 4f9cc30d8ba..3b46591b2e2 100644 --- a/TAO/tao/PI/PICurrent_Loader.h +++ b/TAO/tao/PI/PICurrent_Loader.h @@ -43,11 +43,12 @@ public: ACE_TCHAR *argv []); }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_PICurrent_Loader) ACE_FACTORY_DECLARE (TAO_PI, TAO_PICurrent_Loader) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_INTERCEPTORS == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI/PolicyFactory_Loader.cpp b/TAO/tao/PI/PolicyFactory_Loader.cpp index 3b8e49f062c..bacc2ea9889 100644 --- a/TAO/tao/PI/PolicyFactory_Loader.cpp +++ b/TAO/tao/PI/PolicyFactory_Loader.cpp @@ -39,7 +39,6 @@ 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"), @@ -48,3 +47,5 @@ ACE_STATIC_SVC_DEFINE (TAO_PolicyFactory_Loader, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO_PI, TAO_PolicyFactory_Loader) + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PolicyFactory_Loader.h b/TAO/tao/PI/PolicyFactory_Loader.h index a25c378676e..ca097a75c62 100644 --- a/TAO/tao/PI/PolicyFactory_Loader.h +++ b/TAO/tao/PI/PolicyFactory_Loader.h @@ -42,11 +42,12 @@ public: 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) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_POLICYFACTORY_LOADER_H */ diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp index 9d403bb6245..d953483b5eb 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.cpp +++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp @@ -64,7 +64,6 @@ TAO_PI_Server_Loader::init (int, ACE_TCHAR* []) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////////////////////// @@ -76,3 +75,4 @@ ACE_STATIC_SVC_DEFINE (TAO_PI_Server_Loader, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/PI_Server_Loader.h b/TAO/tao/PI_Server/PI_Server_Loader.h index e0186ef0bd5..81ffeb05250 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.h +++ b/TAO/tao/PI_Server/PI_Server_Loader.h @@ -38,10 +38,11 @@ public: virtual int init (int argc, 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) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PI_SERVER_LOADER_H */ diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp index 37b51488606..958da850a84 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp @@ -37,7 +37,6 @@ 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"), @@ -47,4 +46,6 @@ ACE_STATIC_SVC_DEFINE (TAO_ServerRequestInterceptor_Adapter_Factory_Impl, 0) ACE_FACTORY_DEFINE (TAO_PI_Server, TAO_ServerRequestInterceptor_Adapter_Factory_Impl) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h index 9cd5e06128f..3582cec084d 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h @@ -43,11 +43,12 @@ 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) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_INTERCEPTORS */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp index f07d536b979..ea683b1130a 100644 --- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp +++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp @@ -35,7 +35,6 @@ TAO_Acceptor_Filter_Factory::initialize (void) (ace_svc_desc_TAO_Acceptor_Filter_Factory); } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Acceptor_Filter_Factory) ACE_STATIC_SVC_DEFINE (TAO_Acceptor_Filter_Factory, @@ -46,6 +45,7 @@ ACE_STATIC_SVC_DEFINE (TAO_Acceptor_Filter_Factory, | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h index 403df664d73..702f88ef683 100644 --- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h +++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h @@ -65,11 +65,11 @@ static int TAO_Requires_Acceptor_Filter_Factory = TAO_Acceptor_Filter_Factory::initialize (); -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_Acceptor_Filter_Factory) ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Acceptor_Filter_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)*/ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp index 735a937dc19..1a82a4df0e4 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp @@ -55,7 +55,7 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( IdAssignmentStrategyFactoryImpl, @@ -69,3 +69,4 @@ ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, IdAssignmentStrategyFactoryImpl, TAO::Portable_Server::IdAssignmentStrategyFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h index a42768ac668..5cf61d1021f 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h @@ -42,11 +42,11 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp index d7775832e2c..11a9474effe 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp @@ -27,8 +27,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, IdAssignmentStrategySystem, @@ -42,3 +40,5 @@ ACE_STATIC_SVC_DEFINE ( ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h index e77cbc95b8f..4124cb55db1 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h @@ -40,10 +40,10 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategySystem) ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategySystem) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IDASSIGNMENTSTRATEGYSYSTEM_H */ diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp index 3cfa5cef85a..f97260dc1b8 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp @@ -26,7 +26,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, @@ -40,3 +39,5 @@ ACE_STATIC_SVC_DEFINE ( &ACE_SVC_NAME (IdAssignmentStrategyUser), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h index f3560cef1d5..46ec418d515 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h @@ -40,10 +40,10 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyUser) ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyUser) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IDASSIGNMENTSTRATEGYUSER_H */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp index 64adaf777f5..ade09c36cd2 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp @@ -83,8 +83,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE ( IdUniquenessStrategyFactoryImpl, ACE_TEXT ("IdUniquenessStrategyFactory"), @@ -97,3 +95,6 @@ ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, IdUniquenessStrategyFactoryImpl, TAO::Portable_Server::IdUniquenessStrategyFactoryImpl) + +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h index fe78dfe3f9f..894e331ec7d 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h @@ -44,10 +44,10 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (IdUniquenessStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp index 84cdac1b80d..d1e3920d8f9 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp @@ -48,8 +48,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, IdUniquenessStrategyMultiple, @@ -62,3 +60,5 @@ ACE_STATIC_SVC_DEFINE ( &ACE_SVC_NAME (IdUniquenessStrategyMultiple), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h index a385f72c0c5..fefc7dc0894 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h @@ -49,11 +49,10 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyMultiple) ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyMultiple) +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp index b2e3e2b2dbb..f528cada72a 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -63,7 +63,7 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, @@ -77,3 +77,6 @@ ACE_STATIC_SVC_DEFINE ( &ACE_SVC_NAME (IdUniquenessStrategyUnique), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) + +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h index ef39a1dad61..50f28517237 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h @@ -55,11 +55,10 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUnique) ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUnique) +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_ID_UNIQUENESSSTRATEGYUNIQUE_H */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp index 391077edfc1..3bb16166c08 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp @@ -50,7 +50,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( IdUniquenessStrategyUniqueFactoryImpl, @@ -65,3 +64,4 @@ ACE_FACTORY_NAMESPACE_DEFINE ( IdUniquenessStrategyUniqueFactoryImpl, TAO::Portable_Server::IdUniquenessStrategyUniqueFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h index 5b031d00bbd..24004d50a0c 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h @@ -45,11 +45,10 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp index 09ca4fb613e..30ae08a7469 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp @@ -20,7 +20,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_NAMESPACE_DEFINE ( @@ -36,3 +35,4 @@ ACE_STATIC_SVC_DEFINE ( ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h index af9e70e931e..139a32187dd 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h @@ -38,11 +38,11 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyExplicit) ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyExplicit) +TAO_END_VERSIONED_NAMESPACE_DECL + + #include /**/ "ace/post.h" #endif /* TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp index 1656fcd5c12..9b113b1fafc 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp @@ -57,7 +57,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, @@ -73,3 +72,4 @@ ACE_STATIC_SVC_DEFINE ( ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h index ca6cd277172..ea5d30f3764 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h @@ -45,10 +45,10 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp index edea2d2d328..81878c8b94a 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp @@ -22,7 +22,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, @@ -37,4 +36,6 @@ ACE_STATIC_SVC_DEFINE ( ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h index a1fcea6da7e..015ccf514e5 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h @@ -40,11 +40,11 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyImplicit) ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyImplicit) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp index 2ae31deafd4..700cd5b6527 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp @@ -81,7 +81,7 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( LifespanStrategyFactoryImpl, @@ -95,3 +95,4 @@ ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, LifespanStrategyFactoryImpl, TAO::Portable_Server::LifespanStrategyFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h index e2a9074a622..df805b404aa 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h @@ -44,12 +44,12 @@ namespace TAO }; } } - -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp index 19d079dcb95..2e25ce5ae9e 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp @@ -47,7 +47,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( LifespanStrategyPersistentFactoryImpl, @@ -62,3 +61,4 @@ ACE_FACTORY_NAMESPACE_DEFINE ( LifespanStrategyPersistentFactoryImpl, TAO::Portable_Server::LifespanStrategyPersistentFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h index 4be1c1e4a6c..b3337b7e86a 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h @@ -45,11 +45,11 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp index 724f137d507..ae8085a17bd 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp @@ -47,7 +47,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( LifespanStrategyTransientFactoryImpl, @@ -62,4 +61,5 @@ ACE_FACTORY_NAMESPACE_DEFINE ( LifespanStrategyTransientFactoryImpl, TAO::Portable_Server::LifespanStrategyTransientFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h index dd238cad044..e3f8635ead1 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h @@ -46,11 +46,10 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyTransientFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyTransientFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.cpp b/TAO/tao/PortableServer/Network_Priority_Hook.cpp index 7669319307a..6febf421bb4 100644 --- a/TAO/tao/PortableServer/Network_Priority_Hook.cpp +++ b/TAO/tao/PortableServer/Network_Priority_Hook.cpp @@ -37,7 +37,6 @@ TAO_Network_Priority_Hook::initialize (void) (ace_svc_desc_TAO_Network_Priority_Hook); } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Network_Priority_Hook) ACE_STATIC_SVC_DEFINE (TAO_Network_Priority_Hook, @@ -47,3 +46,4 @@ ACE_STATIC_SVC_DEFINE (TAO_Network_Priority_Hook, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.h b/TAO/tao/PortableServer/Network_Priority_Hook.h index f9300b347dc..7592c609427 100644 --- a/TAO/tao/PortableServer/Network_Priority_Hook.h +++ b/TAO/tao/PortableServer/Network_Priority_Hook.h @@ -60,11 +60,11 @@ static int TAO_Requires_Network_Priority_Hook = TAO_Network_Priority_Hook::initialize (); -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_Network_Priority_Hook) ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Network_Priority_Hook) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_NETWORK_PRIORITY_HOOK_H */ diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp index 0e2859d333c..9461e6264d9 100644 --- a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp +++ b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp @@ -18,7 +18,6 @@ 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, @@ -28,3 +27,4 @@ ACE_STATIC_SVC_DEFINE (TAO_Object_Adapter_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.h b/TAO/tao/PortableServer/Object_Adapter_Factory.h index 77266900e27..63df853bb37 100644 --- a/TAO/tao/PortableServer/Object_Adapter_Factory.h +++ b/TAO/tao/PortableServer/Object_Adapter_Factory.h @@ -36,11 +36,11 @@ public: 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) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_OBJECT_ADAPTER_FACTORY_H */ diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp index baefc206285..970dcca48f5 100644 --- a/TAO/tao/PortableServer/POA_Current_Factory.cpp +++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp @@ -18,8 +18,6 @@ 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"), @@ -28,3 +26,5 @@ ACE_STATIC_SVC_DEFINE (TAO_POA_Current_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/PortableServer/POA_Current_Factory.h b/TAO/tao/PortableServer/POA_Current_Factory.h index 28087757bde..3bc018d8771 100644 --- a/TAO/tao/PortableServer/POA_Current_Factory.h +++ b/TAO/tao/PortableServer/POA_Current_Factory.h @@ -37,11 +37,11 @@ public: ACE_TCHAR *argv []); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_POA_Current_Factory) ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_POA_Current_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_OBJECT_ADAPTER_FACTORY_H */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp index 1b4356873ea..bd1dbfcd0f4 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp @@ -52,7 +52,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyAOMOnlyFactoryImpl, @@ -66,3 +65,4 @@ ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, RequestProcessingStrategyAOMOnlyFactoryImpl, TAO::Portable_Server::RequestProcessingStrategyAOMOnlyFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h index 4c872b79d0c..c533c18baae 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h @@ -45,11 +45,11 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H*/ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp index 949eaa6a2b1..2d35f836d8f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp @@ -56,7 +56,7 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyDefaultServantFactoryImpl, @@ -71,6 +71,7 @@ ACE_FACTORY_NAMESPACE_DEFINE ( RequestProcessingStrategyDefaultServantFactoryImpl, TAO::Portable_Server::RequestProcessingStrategyDefaultServantFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h index 6d97191bd48..9d0014a440b 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h @@ -47,11 +47,11 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp index f31beb3ca33..7b099039acd 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp @@ -133,7 +133,7 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyFactoryImpl, @@ -147,3 +147,4 @@ ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, RequestProcessingStrategyFactoryImpl, TAO::Portable_Server::RequestProcessingStrategyFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h index 46139e3049a..d1515e48e75 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h @@ -44,11 +44,11 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp index 00f26e37559..4afafb884be 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp @@ -68,7 +68,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyServantActivatorFactoryImpl, @@ -83,5 +82,7 @@ ACE_FACTORY_NAMESPACE_DEFINE ( RequestProcessingStrategyServantActivatorFactoryImpl, TAO::Portable_Server::RequestProcessingStrategyServantActivatorFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h index 6e3cef0f752..c7792fea0e0 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h @@ -47,11 +47,11 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp index 01b51f34b47..e71553ede87 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp @@ -67,7 +67,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyServantLocatorFactoryImpl, @@ -82,6 +81,7 @@ ACE_FACTORY_NAMESPACE_DEFINE ( RequestProcessingStrategyServantLocatorFactoryImpl, TAO::Portable_Server::RequestProcessingStrategyServantLocatorFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h index de7bcb6d926..1c156b8e29f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h @@ -45,11 +45,11 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp index 72da99cd4aa..be704740000 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp @@ -84,7 +84,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( ServantRetentionStrategyFactoryImpl, @@ -98,3 +97,5 @@ ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, ServantRetentionStrategyFactoryImpl, TAO::Portable_Server::ServantRetentionStrategyFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h index a3d45b9f353..80b9e302bc9 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h @@ -44,10 +44,10 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp index 80f95a4b549..2fbf8cc8de9 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp @@ -55,7 +55,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( ServantRetentionStrategyNonRetainFactoryImpl, @@ -69,5 +68,6 @@ ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, ServantRetentionStrategyNonRetainFactoryImpl, TAO::Portable_Server::ServantRetentionStrategyNonRetainFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_MINIMUM_POA == 0 && !CORBA_E_COMPACT && !CORBA_E_MICRO */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h index e7351acdbbf..48ca49d9696 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h @@ -46,11 +46,11 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp index a07f01c7a96..18048bd07d2 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp @@ -51,7 +51,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( ServantRetentionStrategyRetainFactoryImpl, @@ -65,3 +64,4 @@ ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, ServantRetentionStrategyRetainFactoryImpl, TAO::Portable_Server::ServantRetentionStrategyRetainFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h index 87e553d33d7..5cedfa1b4ef 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h @@ -44,11 +44,11 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H*/ diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp index 403750f6777..4667bf58395 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp @@ -84,7 +84,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( ThreadStrategyFactoryImpl, @@ -99,3 +98,4 @@ ACE_FACTORY_NAMESPACE_DEFINE ( ThreadStrategyFactoryImpl, TAO::Portable_Server::ThreadStrategyFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h index 324e4802743..f7d6cbc341f 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h @@ -44,10 +44,10 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp index 9aba0bb6f8b..e5c2e6b47a9 100644 --- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp @@ -33,7 +33,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_NAMESPACE_DEFINE ( @@ -48,3 +47,4 @@ ACE_STATIC_SVC_DEFINE ( &ACE_SVC_NAME (ThreadStrategyORBControl), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.h b/TAO/tao/PortableServer/ThreadStrategyORBControl.h index d88997c2214..19b3af4d750 100644 --- a/TAO/tao/PortableServer/ThreadStrategyORBControl.h +++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.h @@ -44,11 +44,11 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyORBControl) ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyORBControl) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_THREADSTRATEGYORBCONTROL_H */ diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp index 65bbfc2e847..166aaf1cec4 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp @@ -38,7 +38,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, @@ -52,5 +51,6 @@ ACE_STATIC_SVC_DEFINE ( &ACE_SVC_NAME (ThreadStrategySingle), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h index 08489c7df75..3cbde4d836a 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.h +++ b/TAO/tao/PortableServer/ThreadStrategySingle.h @@ -56,11 +56,11 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingle) ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingle) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp index c082224cb0f..bcccac2035f 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp @@ -53,7 +53,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( ThreadStrategySingleFactoryImpl, @@ -67,5 +66,6 @@ ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, ThreadStrategySingleFactoryImpl, TAO::Portable_Server::ThreadStrategySingleFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h index c5873d0129e..b85b56b7a1e 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h @@ -44,11 +44,11 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingleFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingleFactoryImpl) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp index ff81c17061e..dea1f603248 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp @@ -37,7 +37,6 @@ RT_Endpoint_Selector_Factory::get_selector (void) return this->rt_invocation_endpoint_selector_; } -TAO_END_VERSIONED_NAMESPACE_DECL // **************************************************************** @@ -49,4 +48,6 @@ ACE_STATIC_SVC_DEFINE (RT_Endpoint_Selector_Factory, 0) ACE_FACTORY_DEFINE (TAO_RTCORBA, RT_Endpoint_Selector_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h index 00e232233c8..dc3888f6da7 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h +++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h @@ -65,11 +65,12 @@ 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) +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_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp index e7f2844d531..1d82a606d5a 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp @@ -199,7 +199,6 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[]) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////////////////////// @@ -211,5 +210,6 @@ ACE_STATIC_SVC_DEFINE (TAO_RT_ORB_Loader, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.h b/TAO/tao/RTCORBA/RT_ORB_Loader.h index b4314aa584c..2c0f246d44c 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.h +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.h @@ -44,11 +44,12 @@ public: virtual int init (int argc, 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) +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_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index 8637fb8048e..cf2123c5759 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -705,7 +705,6 @@ 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"), @@ -716,4 +715,6 @@ ACE_STATIC_SVC_DEFINE (TAO_RT_Protocols_Hooks, 0) ACE_FACTORY_DEFINE (TAO_RTCORBA, TAO_RT_Protocols_Hooks) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h index 6a90c36d260..3566e7e2c36 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h @@ -162,11 +162,12 @@ 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) +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 cbcc331f8c5..9cd059f682d 100644 --- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp +++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp @@ -37,7 +37,6 @@ TAO_RT_Stub_Factory::create_stub (const char *repository_id, return retval; } -TAO_END_VERSIONED_NAMESPACE_DECL // **************************************************************** @@ -49,4 +48,6 @@ ACE_STATIC_SVC_DEFINE (TAO_RT_Stub_Factory, 0) ACE_FACTORY_DEFINE (TAO_RTCORBA, TAO_RT_Stub_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h index 109783a88af..716323fce59 100644 --- a/TAO/tao/RTCORBA/RT_Stub_Factory.h +++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h @@ -56,11 +56,12 @@ public: TAO_ORB_Core *orb_core); }; -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) +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_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp index 7498ef44d68..56fa0ad820e 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp @@ -144,8 +144,6 @@ 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, @@ -154,4 +152,6 @@ ACE_STATIC_SVC_DEFINE (TAO_RT_Thread_Lane_Resources_Manager_Factory, 0) ACE_FACTORY_DEFINE (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h index 9b508f47da5..cfc5dbc30fa 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h @@ -104,11 +104,13 @@ 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) +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 f11b3cd3c52..2757f4bdbca 100644 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp +++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp @@ -106,7 +106,6 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object) const return false; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_RT_Collocation_Resolver, ACE_TEXT ("RT_Collocation_Resolver"), @@ -116,4 +115,6 @@ ACE_STATIC_SVC_DEFINE (TAO_RT_Collocation_Resolver, 0) ACE_FACTORY_DEFINE (TAO_RTPortableServer, TAO_RT_Collocation_Resolver) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h index a820c4dda34..c0805650eb3 100644 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h +++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h @@ -46,11 +46,12 @@ public: virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object) 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) +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_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp index 837913a0950..c501056af06 100644 --- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp +++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp @@ -52,7 +52,6 @@ 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, @@ -62,4 +61,6 @@ ACE_STATIC_SVC_DEFINE (TAO_RT_Object_Adapter_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h index 5749011b0e6..130b39ec65b 100644 --- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h +++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h @@ -38,11 +38,12 @@ public: 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) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/COIOP_Factory.cpp b/TAO/tao/Strategies/COIOP_Factory.cpp index 655ca4386ab..3edd438776a 100644 --- a/TAO/tao/Strategies/COIOP_Factory.cpp +++ b/TAO/tao/Strategies/COIOP_Factory.cpp @@ -83,7 +83,6 @@ TAO_COIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_COIOP_Protocol_Factory, ACE_TEXT ("COIOP_Factory"), @@ -95,4 +94,6 @@ ACE_STATIC_SVC_DEFINE (TAO_COIOP_Protocol_Factory, ACE_FACTORY_DEFINE (TAO_Strategies, TAO_COIOP_Protocol_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_COIOP && TAO_HAS_COIOP != 0 */ diff --git a/TAO/tao/Strategies/COIOP_Factory.h b/TAO/tao/Strategies/COIOP_Factory.h index f63cfebf274..1bb5cbfd7a1 100644 --- a/TAO/tao/Strategies/COIOP_Factory.h +++ b/TAO/tao/Strategies/COIOP_Factory.h @@ -69,11 +69,12 @@ public: //@} }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_COIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_COIOP_Protocol_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_COIOP && TAO_HAS_COIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp index a5c78d26b79..53722ace578 100644 --- a/TAO/tao/Strategies/DIOP_Factory.cpp +++ b/TAO/tao/Strategies/DIOP_Factory.cpp @@ -91,7 +91,6 @@ TAO_DIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_DIOP_Protocol_Factory, ACE_TEXT ("DIOP_Factory"), @@ -103,4 +102,6 @@ ACE_STATIC_SVC_DEFINE (TAO_DIOP_Protocol_Factory, ACE_FACTORY_DEFINE (TAO_Strategies, TAO_DIOP_Protocol_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h index 9085f37f7fb..8dcaae4f08b 100644 --- a/TAO/tao/Strategies/DIOP_Factory.h +++ b/TAO/tao/Strategies/DIOP_Factory.h @@ -69,11 +69,12 @@ public: //@} }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_DIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_DIOP_Protocol_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp index 12a9457faf7..69b63f857bf 100644 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp @@ -92,7 +92,6 @@ TAO_OC_Endpoint_Selector_Factory::get_selector (void) return this->oc_endpoint_selector_; } -TAO_END_VERSIONED_NAMESPACE_DECL // **************************************************************** @@ -103,3 +102,5 @@ ACE_STATIC_SVC_DEFINE (TAO_OC_Endpoint_Selector_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h index fed0692e530..76adab6be12 100644 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h +++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h @@ -77,11 +77,12 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_OC_ENDPOINT_SELECTOR_FACTORY_H */ diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp index ca3dfb1c365..a80c8f7e0b3 100644 --- a/TAO/tao/Strategies/SCIOP_Factory.cpp +++ b/TAO/tao/Strategies/SCIOP_Factory.cpp @@ -78,7 +78,6 @@ TAO_SCIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_SCIOP_Protocol_Factory, ACE_TEXT ("SCIOP_Factory"), @@ -90,4 +89,6 @@ ACE_STATIC_SVC_DEFINE (TAO_SCIOP_Protocol_Factory, ACE_FACTORY_DEFINE (TAO, TAO_SCIOP_Protocol_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h index 6bf649a1825..0705d3b940d 100644 --- a/TAO/tao/Strategies/SCIOP_Factory.h +++ b/TAO/tao/Strategies/SCIOP_Factory.h @@ -59,11 +59,11 @@ public: virtual int requires_explicit_endpoint (void) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_SCIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SCIOP_Protocol_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp index c7b0a4d24fc..959e03d9bac 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.cpp +++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp @@ -116,7 +116,6 @@ TAO_SHMIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_SHMIOP_Protocol_Factory, ACE_TEXT ("SHMIOP_Factory"), @@ -128,4 +127,6 @@ ACE_STATIC_SVC_DEFINE (TAO_SHMIOP_Protocol_Factory, ACE_FACTORY_DEFINE (TAO_Strategies, TAO_SHMIOP_Protocol_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Factory.h b/TAO/tao/Strategies/SHMIOP_Factory.h index 3f063f0ef4a..c1153c4c735 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.h +++ b/TAO/tao/Strategies/SHMIOP_Factory.h @@ -82,11 +82,12 @@ private: ACE_OFF_T min_bytes_; }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_SHMIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SHMIOP_Protocol_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp index 0399804ad53..b679a682428 100644 --- a/TAO/tao/Strategies/UIOP_Factory.cpp +++ b/TAO/tao/Strategies/UIOP_Factory.cpp @@ -86,7 +86,6 @@ TAO_UIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_UIOP_Protocol_Factory, ACE_TEXT ("UIOP_Factory"), @@ -98,5 +97,7 @@ ACE_STATIC_SVC_DEFINE (TAO_UIOP_Protocol_Factory, ACE_FACTORY_DEFINE (TAO_Strategies, TAO_UIOP_Protocol_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Factory.h b/TAO/tao/Strategies/UIOP_Factory.h index c33e1b5df65..e21db7d9dc9 100644 --- a/TAO/tao/Strategies/UIOP_Factory.h +++ b/TAO/tao/Strategies/UIOP_Factory.h @@ -68,11 +68,12 @@ public: //@} }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_UIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_UIOP_Protocol_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + # endif /* TAO_HAS_UIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index fcb473a3351..70a1fd881da 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -682,7 +682,6 @@ TAO_Advanced_Resource_Factory::report_unsupported_error ( option_name)); } -TAO_END_VERSIONED_NAMESPACE_DECL // **************************************************************** @@ -695,3 +694,4 @@ ACE_STATIC_SVC_DEFINE (TAO_Advanced_Resource_Factory, ACE_FACTORY_DEFINE (TAO_Strategies, TAO_Advanced_Resource_Factory) // **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h index b7bf67f65f8..105d2e303e0 100644 --- a/TAO/tao/Strategies/advanced_resource.h +++ b/TAO/tao/Strategies/advanced_resource.h @@ -140,10 +140,11 @@ protected: static TAO_Resource_Factory_Changer TAO_changer; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_Advanced_Resource_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_Advanced_Resource_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ADVANCED_RESOURCE_H */ diff --git a/TAO/tao/TransportCurrent/Current_Loader.h b/TAO/tao/TransportCurrent/Current_Loader.h index e76fdd81453..a45da1b0135 100644 --- a/TAO/tao/TransportCurrent/Current_Loader.h +++ b/TAO/tao/TransportCurrent/Current_Loader.h @@ -66,14 +66,15 @@ namespace TAO #endif /* defined (TAO_AS_STATIC_LIBS) */ -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Transport_Current, TAO_Transport_Current_Loader) ACE_FACTORY_DECLARE (TAO_Transport_Current, TAO_Transport_Current_Loader) +TAO_END_VERSIONED_NAMESPACE_DECL + + #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp index 38aaeda8a59..0d3805fe791 100644 --- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp +++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp @@ -93,6 +93,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL } #endif /* defined (TAO_AS_STATIC_LIBS) */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_Transport_IIOP_Current_Loader, ACE_TEXT ("TAO_Transport_IIOP_Current_Loader"), @@ -104,5 +105,5 @@ ACE_STATIC_SVC_DEFINE (TAO_Transport_IIOP_Current_Loader, ACE_FACTORY_NAMESPACE_DEFINE (TAO_Transport_Current, TAO_Transport_IIOP_Current_Loader, TAO::Transport::IIOP::Current_Loader) - +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h index e2b74e217e0..0473e69d4f0 100644 --- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h +++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h @@ -63,7 +63,6 @@ namespace TAO #endif /* defined (TAO_AS_STATIC_LIBS) */ -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Transport_Current, TAO_Transport_IIOP_Current_Loader) @@ -71,6 +70,8 @@ ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Transport_Current, ACE_FACTORY_DECLARE (TAO_Transport_Current, TAO_Transport_IIOP_Current_Loader) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ #endif /* TAO_TRANSPORT_IIOP_TRAITS_LOADER_H */ diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp index 1f987d36639..185d5544fb2 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp @@ -44,7 +44,6 @@ TAO_Valuetype_Adapter_Factory_Impl::Initializer (void) ); } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( TAO_Valuetype_Adapter_Factory_Impl, @@ -56,3 +55,4 @@ ACE_STATIC_SVC_DEFINE ( ) ACE_FACTORY_DEFINE (TAO_Valuetype, TAO_Valuetype_Adapter_Factory_Impl) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h index 4bd8e07b2da..147acf0c533 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h @@ -53,11 +53,12 @@ static int TAO_Requires_ValueType_Initializer = TAO_Valuetype_Adapter_Factory_Impl::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_Valuetype_Adapter_Factory_Impl) ACE_FACTORY_DECLARE (TAO_Valuetype, TAO_Valuetype_Adapter_Factory_Impl) +TAO_END_VERSIONED_NAMESPACE_DECL + #define TAO_VALUETYPE_SAFE_INCLUDE // #include "tao/ValueType/ValueTypeC.h" #undef TAO_VALUETYPE_SAFE_INCLUDE diff --git a/TAO/tao/ZIOP/ZIOP.cpp b/TAO/tao/ZIOP/ZIOP.cpp index f8c9e9745b3..0378a143964 100644 --- a/TAO/tao/ZIOP/ZIOP.cpp +++ b/TAO/tao/ZIOP/ZIOP.cpp @@ -441,7 +441,6 @@ TAO_ZIOP_Loader::marshal_reply_data (TAO_ServerRequest& server_request, return true; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_ZIOP_Loader, ACE_TEXT ("ZIOP_Loader"), @@ -452,3 +451,4 @@ ACE_STATIC_SVC_DEFINE (TAO_ZIOP_Loader, ACE_FACTORY_DEFINE (TAO_ZIOP, TAO_ZIOP_Loader) +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ZIOP/ZIOP.h b/TAO/tao/ZIOP/ZIOP.h index 8d4f0fd5acf..c21dc518c51 100644 --- a/TAO/tao/ZIOP/ZIOP.h +++ b/TAO/tao/ZIOP/ZIOP.h @@ -83,11 +83,11 @@ private: static int TAO_Requires_ZIOP_Initializer = TAO_ZIOP_Loader::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_ZIOP_Loader) ACE_FACTORY_DECLARE (TAO_ZIOP, TAO_ZIOP_Loader) +TAO_END_VERSIONED_NAMESPACE_DECL #define TAO_ZIOP_SAFE_INCLUDE #include "tao/ZIOP/ZIOPC.h" diff --git a/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp b/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp index 07ac86bba88..e9c55ca7507 100644 --- a/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp +++ b/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp @@ -35,7 +35,6 @@ TAO_ZIOP_Stub_Factory::create_stub (const char *repository_id, return retval; } -TAO_END_VERSIONED_NAMESPACE_DECL // **************************************************************** @@ -47,4 +46,6 @@ ACE_STATIC_SVC_DEFINE (TAO_ZIOP_Stub_Factory, 0) ACE_FACTORY_DEFINE (TAO_ZIOP, TAO_ZIOP_Stub_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/tao/ZIOP/ZIOP_Stub_Factory.h b/TAO/tao/ZIOP/ZIOP_Stub_Factory.h index 1eca54aa8e6..38f4a5c9533 100644 --- a/TAO/tao/ZIOP/ZIOP_Stub_Factory.h +++ b/TAO/tao/ZIOP/ZIOP_Stub_Factory.h @@ -55,11 +55,12 @@ public: TAO_ORB_Core *orb_core); }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_ZIOP, TAO_ZIOP_Stub_Factory) ACE_FACTORY_DECLARE (TAO_ZIOP, TAO_ZIOP_Stub_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #endif #include /**/ "ace/post.h" diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index 92aa4ee63de..2191ecca969 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -453,8 +453,6 @@ TAO_Default_Client_Strategy_Factory::use_cleanup_options (void) const return this->use_cleanup_options_; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Default_Client_Strategy_Factory, @@ -464,3 +462,6 @@ ACE_STATIC_SVC_DEFINE (TAO_Default_Client_Strategy_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO, TAO_Default_Client_Strategy_Factory) + +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h index 7adaf0a6e53..45b13292db3 100644 --- a/TAO/tao/default_client.h +++ b/TAO/tao/default_client.h @@ -111,10 +111,10 @@ private: bool use_cleanup_options_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Client_Strategy_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Client_Strategy_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_DEFAULT_CLIENT_H */ diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 3a9946313aa..1561c2bf47f 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -1300,8 +1300,6 @@ TAO_Default_Resource_Factory::drop_replies_during_shutdown (void) const return this->drop_replies_; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Default_Resource_Factory, @@ -1312,3 +1310,6 @@ ACE_STATIC_SVC_DEFINE (TAO_Default_Resource_Factory, | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO, TAO_Default_Resource_Factory) + +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index 81cd0fe3a1e..4c7d67f6194 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -319,10 +319,10 @@ private: bool drop_replies_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Resource_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Resource_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_DEFAULT_CLIENT_H */ diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp index 3ebc4dadc7f..a2b920384be 100644 --- a/TAO/tao/default_server.cpp +++ b/TAO/tao/default_server.cpp @@ -382,8 +382,6 @@ TAO_Default_Server_Strategy_Factory::report_option_value_error ( option_value, option_name)); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_Default_Server_Strategy_Factory, ACE_TEXT ("Server_Strategy_Factory"), ACE_SVC_OBJ_T, @@ -391,3 +389,6 @@ ACE_STATIC_SVC_DEFINE (TAO_Default_Server_Strategy_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO, TAO_Default_Server_Strategy_Factory) + +TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h index e346b7eaca2..e37cf95a468 100644 --- a/TAO/tao/default_server.h +++ b/TAO/tao/default_server.h @@ -86,10 +86,10 @@ protected: ACE_Time_Value thread_per_connection_timeout_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Server_Strategy_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Server_Strategy_Factory) +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_DEFAULT_SERVER_FACTORY_H */ |