diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp index 63ad2be955f..f3c19c757ee 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp @@ -77,14 +77,14 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb, { if (resolve_for_existing_naming_service) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Try to find an existing Naming Service. CORBA::Object_var naming_obj = orb->resolve_initial_references ("NameService", timeout - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (naming_obj.in ())) @@ -98,12 +98,12 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb, this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->naming_service_ior_ = orb->object_to_string (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -202,7 +202,7 @@ TAO_Naming_Server::init_with_orb (int argc, { int result; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Duplicate the ORB @@ -210,7 +210,7 @@ TAO_Naming_Server::init_with_orb (int argc, // Get the POA from the ORB. CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -222,15 +222,15 @@ TAO_Naming_Server::init_with_orb (int argc, // Get the POA object. this->root_poa_ = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_Manager. PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies (2); @@ -239,13 +239,13 @@ TAO_Naming_Server::init_with_orb (int argc, // Id Assignment policy policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan policy policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We use a different POA, otherwise the user would have to change @@ -253,7 +253,7 @@ TAO_Naming_Server::init_with_orb (int argc, this->ns_poa_ = this->root_poa_->create_POA ("NameService", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Warning! If create_POA fails, then the policies won't be // destroyed and there will be hell to pay in memory leaks! ACE_TRY_CHECK; @@ -264,7 +264,7 @@ TAO_Naming_Server::init_with_orb (int argc, ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -328,7 +328,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, size_t context_size, int enable_multicast) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (persistence_location != 0) @@ -364,7 +364,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, TAO_Transient_Naming_Context::make_new_context (poa, TAO_ROOT_NAMING_CONTEXT, context_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -372,15 +372,15 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, // Set the ior of the root Naming Context. this->naming_service_ior_= orb->object_to_string (this->naming_context_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { @@ -390,9 +390,9 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, { CORBA::String_var ior = orb->object_to_string (this->naming_context_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - adapter->bind ("NameService", ior.in () TAO_ENV_ARG_PARAMETER); + adapter->bind ("NameService", ior.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -492,17 +492,17 @@ TAO_Naming_Server::fini (void) // the Naming Service ACE_TRY_NEW_ENV { - this->ns_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + this->ns_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var table_object = this->orb_->resolve_initial_references ("IORTable" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { @@ -510,7 +510,7 @@ TAO_Naming_Server::fini (void) } else { - adapter->unbind ("NameService" TAO_ENV_ARG_PARAMETER); + adapter->unbind ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -564,11 +564,11 @@ int TAO_Naming_Client::init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService", timeout TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService", timeout ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -577,7 +577,7 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb, -1); this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |