diff options
Diffstat (limited to 'TAO/tao/ORBInitializer_Registry.cpp')
| -rw-r--r-- | TAO/tao/ORBInitializer_Registry.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index 8ffb366b552..bcaa3b1bfc2 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -17,7 +17,7 @@ ACE_RCSID(tao, ORBInitializer_Registry, "$Id$") void PortableInterceptor::register_orb_initializer ( PortableInterceptor::ORBInitializer_ptr init - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Using ACE_Static_Object_Lock::instance() precludes // <register_orb_initializer> from being called within a static @@ -33,7 +33,7 @@ PortableInterceptor::register_orb_initializer ( ACE_TEXT ("Unable to pre-initialize TAO\n"))); } - CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Make sure the following is done after the global ORB @@ -41,7 +41,7 @@ PortableInterceptor::register_orb_initializer ( TAO_ORBInitializer_Registry::instance ()->register_orb_initializer ( init - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // ------------------------------------------------------------------ @@ -61,7 +61,7 @@ TAO_ORBInitializer_Registry::~TAO_ORBInitializer_Registry (void) void TAO_ORBInitializer_Registry::register_orb_initializer ( PortableInterceptor::ORBInitializer_ptr init - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (!CORBA::is_nil (init)) { @@ -89,13 +89,13 @@ TAO_ORBInitializer_Registry::register_orb_initializer ( void TAO_ORBInitializer_Registry::pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { size_t initializer_count = this->initializers_.size (); for (size_t i = 0; i < initializer_count; ++i) { this->initializers_[i]->pre_init (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -103,13 +103,13 @@ TAO_ORBInitializer_Registry::pre_init ( void TAO_ORBInitializer_Registry::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { size_t initializer_count = this->initializers_.size (); for (size_t i = 0; i < initializer_count; ++i) { this->initializers_[i]->post_init (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } |