diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp index ef214adf61c..7b83b34e9b3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -26,7 +26,7 @@ TAO_Naming_Context::~TAO_Naming_Context (void) } PortableServer::POA_ptr -TAO_Naming_Context::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) +TAO_Naming_Context::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) { return impl_->_default_POA (); } @@ -34,110 +34,110 @@ TAO_Naming_Context::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) void TAO_Naming_Context::bind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName, CosNaming::NamingContext::AlreadyBound)) { - impl_->bind (n, obj TAO_ENV_ARG_PARAMETER); + impl_->bind (n, obj ACE_ENV_ARG_PARAMETER); } void TAO_Naming_Context::rebind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - impl_->rebind (n, obj TAO_ENV_ARG_PARAMETER); + impl_->rebind (n, obj ACE_ENV_ARG_PARAMETER); } void TAO_Naming_Context::bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName, CosNaming::NamingContext::AlreadyBound)) { - impl_->bind_context (n, nc TAO_ENV_ARG_PARAMETER); + impl_->bind_context (n, nc ACE_ENV_ARG_PARAMETER); } void TAO_Naming_Context::rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - impl_->rebind_context (n, nc TAO_ENV_ARG_PARAMETER); + impl_->rebind_context (n, nc ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr TAO_Naming_Context::resolve (const CosNaming::Name &n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - return impl_->resolve (n TAO_ENV_ARG_PARAMETER); + return impl_->resolve (n ACE_ENV_ARG_PARAMETER); } void TAO_Naming_Context::unbind (const CosNaming::Name &n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - impl_->unbind (n TAO_ENV_ARG_PARAMETER); + impl_->unbind (n ACE_ENV_ARG_PARAMETER); } CosNaming::NamingContext_ptr -TAO_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL) +TAO_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return impl_->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl_->new_context (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNaming::NamingContext_ptr TAO_Naming_Context::bind_new_context (const CosNaming::Name &n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::AlreadyBound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - return impl_->bind_new_context (n TAO_ENV_ARG_PARAMETER); + return impl_->bind_new_context (n ACE_ENV_ARG_PARAMETER); } void -TAO_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotEmpty)) { - impl_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); } void TAO_Naming_Context::list (CORBA::ULong how_many, CosNaming::BindingList_out bl, CosNaming::BindingIterator_out bi - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - impl_->list (how_many, bl, bi TAO_ENV_ARG_PARAMETER); + impl_->list (how_many, bl, bi ACE_ENV_ARG_PARAMETER); } void @@ -173,7 +173,7 @@ to_string_helper_assign (char * &k, const char * &src) char * TAO_Naming_Context::to_string (const CosNaming::Name &n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)) { @@ -289,7 +289,7 @@ to_name_helper (char *dest, const char*& src) CosNaming::Name * TAO_Naming_Context::to_name (const char *sn - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)) { @@ -408,7 +408,7 @@ size_t TAO_Naming_Context::to_url_validate_and_compute_size ( const char *addr, const char *sn - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { size_t addr_len = ACE_OS_String::strlen (addr); @@ -439,7 +439,7 @@ TAO_Naming_Context::to_url_validate_and_compute_size ( char * TAO_Naming_Context::to_url (const char * addr, const char * sn - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContextExt::InvalidAddress, CosNaming::NamingContext::InvalidName)) @@ -447,7 +447,7 @@ TAO_Naming_Context::to_url (const char * addr, /// Compute how many characters will be required for the URL CORBA::ULong no_char = TAO_Naming_Context::to_url_validate_and_compute_size (addr, sn - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -510,7 +510,7 @@ TAO_Naming_Context::to_url (const char * addr, CORBA::Object_ptr TAO_Naming_Context::resolve_str (const char * n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -521,11 +521,11 @@ TAO_Naming_Context::resolve_str (const char * n // argument instead of a Name. // Get the unstrigified name. - CosNaming::Name_var name = this->to_name (n TAO_ENV_ARG_PARAMETER); + CosNaming::Name_var name = this->to_name (n ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Pass this unstringified name to resolve and return an Object_ptr - return this->resolve (name.in () TAO_ENV_ARG_PARAMETER); + return this->resolve (name.in () ACE_ENV_ARG_PARAMETER); } TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl (void) |