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 | 4f7440415dd91da070a826cbc8bfb8ca04a0f285 (patch) | |
| tree | 6c75afb92c7be990454c9109364b4d717a2234c9 /TAO/tao/RTPortableServer | |
| parent | 3cfcd948827396b4eebb3c85c45916182cfbc6cf (diff) | |
| download | ATCD-4f7440415dd91da070a826cbc8bfb8ca04a0f285.tar.gz | |
Fri Jan 30 14:52:30 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/RTPortableServer')
4 files changed, 8 insertions, 4 deletions
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" |