diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp index 98a689c88f7..9294d35a9ad 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp @@ -50,7 +50,7 @@ TAO_Hash_Naming_Context::_default_POA (void) CosNaming::NamingContext_ptr TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Naming context we will return. CosNaming::NamingContext_var result = @@ -69,12 +69,12 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name { // Resolve the name. CORBA::Object_var context = resolve (comp_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try narrowing object reference to the NamingContext type. result = CosNaming::NamingContext::_narrow (context.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::NotFound, ex) @@ -109,7 +109,7 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name void TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -134,13 +134,13 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, if (name_len > 1) { CosNaming::NamingContext_var context = - this->get_context (n TAO_ENV_ARG_PARAMETER); + this->get_context (n ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->bind (simple_name, obj TAO_ENV_ARG_PARAMETER); + context->bind (simple_name, obj ACE_ENV_ARG_PARAMETER); ACE_CHECK; } // If we received a simple name, we need to bind it in this context. @@ -163,7 +163,7 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, void TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -188,13 +188,13 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, if (name_len > 1) { CosNaming::NamingContext_var context = - get_context (n TAO_ENV_ARG_PARAMETER); + get_context (n ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->rebind (simple_name, obj TAO_ENV_ARG_PARAMETER); + context->rebind (simple_name, obj ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -219,7 +219,7 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, void TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -248,13 +248,13 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n, if (name_len > 1) { CosNaming::NamingContext_var context = - get_context (n TAO_ENV_ARG_PARAMETER); + get_context (n ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->bind_context (simple_name, nc TAO_ENV_ARG_PARAMETER); + context->bind_context (simple_name, nc ACE_ENV_ARG_PARAMETER); ACE_CHECK; } // If we received a simple name, we need to bind it in this context. @@ -277,7 +277,7 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n, void TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -302,13 +302,13 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n, if (name_len > 1) { CosNaming::NamingContext_var context = - get_context (n TAO_ENV_ARG_PARAMETER); + get_context (n ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->rebind_context (simple_name, nc TAO_ENV_ARG_PARAMETER); + context->rebind_context (simple_name, nc ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -332,7 +332,7 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n, CORBA::Object_ptr TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -382,7 +382,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n { // Narrow to NamingContext. context = CosNaming::NamingContext::_narrow (result.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result._retn ()); } else @@ -416,7 +416,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n // If there are any exceptions, they will propagate up. return context->resolve (rest_of_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } } // If the name we had to resolve was simple, we just need to return @@ -426,7 +426,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n void TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -451,13 +451,13 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n if (name_len > 1) { CosNaming::NamingContext_var context = - get_context (n TAO_ENV_ARG_PARAMETER); + get_context (n ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->unbind (simple_name TAO_ENV_ARG_PARAMETER); + context->unbind (simple_name ACE_ENV_ARG_PARAMETER); ACE_CHECK; } // If we received a simple name, we need to unbind it in this @@ -472,7 +472,7 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n CosNaming::NamingContext_ptr TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, @@ -491,7 +491,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n CosNaming::NamingContext::_nil (); // Create new context. - result = new_context (TAO_ENV_SINGLE_ARG_PARAMETER); + result = new_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); // Bind the new context to the name. @@ -499,7 +499,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n { bind_context (n, result.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -508,10 +508,10 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n // created context, should any exceptions be raised by the // destroy() operation we want to ignore them. { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY_EX(DESTROY) { - result->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + result->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX(DESTROY); } ACE_CATCHANY {} ACE_ENDTRY; @@ -526,7 +526,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n } void -TAO_Hash_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Hash_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, @@ -563,7 +563,7 @@ TAO_Hash_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } |