diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index 7168ed8deb4..e7ffff27984 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -55,7 +55,7 @@ public: virtual void bind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -72,7 +72,7 @@ public: virtual void rebind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -85,7 +85,7 @@ public: virtual void bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -98,7 +98,7 @@ public: virtual void rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -108,7 +108,7 @@ public: // names are passed. virtual CORBA::Object_ptr resolve (const CosNaming::Name &n - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -120,7 +120,7 @@ public: // for "narrowing" the object to the appropriate type. virtual void unbind (const CosNaming::Name &n - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -131,7 +131,7 @@ public: // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>) virtual CosNaming::NamingContext_ptr new_context ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation returns a new naming context implemented by the @@ -140,7 +140,7 @@ public: virtual CosNaming::NamingContext_ptr bind_new_context ( const CosNaming::Name &n - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::AlreadyBound, @@ -153,7 +153,7 @@ public: // bound (the name argument excluding the last component). - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotEmpty)); // Delete the naming context. The user should take care to <unbind> any @@ -166,7 +166,7 @@ public: virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out bl, CosNaming::BindingIterator_out bi - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns at most the requested number of bindings <how_many> in @@ -175,7 +175,7 @@ public: // not contain any additional bindings <bi> returned as null. virtual char * to_string (const CosNaming::Name &n - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)); // Stringify the name using '\' as the escape character. The @@ -184,7 +184,7 @@ public: // an InvalidName exception is to be raised. virtual CosNaming::Name * to_name (const char *sn - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)); // The in parameter is an stringified name. This function removes the @@ -193,7 +193,7 @@ public: virtual char * to_url ( const char * addr, const char * sn - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -206,7 +206,7 @@ public: // iiopname://1.1@myhost.555xyz.com:9999/a/b/c virtual CORBA::Object_ptr resolve_str (const char * n - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -220,7 +220,7 @@ public: // It accepts a strigified name as an argument instead of a Name. - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Returns the Default POA of this Servant object private: @@ -252,7 +252,7 @@ private: static size_t to_url_validate_and_compute_size (const char *add, const char *sn - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Validate the to_url() method input, and compute the size of the // returned URL address. @@ -281,7 +281,7 @@ public: virtual void bind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Create a binding for name <n> and object <obj> in the naming // context. Compound names are treated as follows: ctx->bind (<c1; // c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>, @@ -292,7 +292,7 @@ public: virtual void rebind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // This is similar to <bind> operation above, except for when the // binding for the specified name already exists in the specified // context. In that case, the existing binding is replaced with the @@ -300,20 +300,20 @@ public: virtual void bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // This is the version of <bind> specifically for binding naming // contexts, so that they will participate in name resolution when // compound names are passed to be resolved. virtual void rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // This is a version of <rebind> specifically for naming contexts, // so that they can participate in name resolution when compound // names are passed. virtual CORBA::Object_ptr resolve (const CosNaming::Name &n - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Return object reference that is bound to the name. Compound name // resolve is defined as follows: ctx->resolve (<c1; c2; cn>) = // ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The naming service @@ -321,24 +321,24 @@ public: // for "narrowing" the object to the appropriate type. virtual void unbind (const CosNaming::Name &n - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Remove the name binding from the context. When compound names // are used, unbind is defined as follows: ctx->unbind (<c1; c2; // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>) - virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL) = 0; // This operation returns a new naming context implemented by the // same naming server in which the operation was invoked. The // context is not bound. virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // This operation creates a new context and binds it to the name // supplied as an argument. The newly-created context is // implemented by the same server as the context in which it was // bound (the name argument excluding the last component). - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) = 0; // Delete the naming context. The user should take care to <unbind> any // bindings in which the given context is bound to some names, to // avoid dangling references when invoking <destroy> operation. @@ -349,7 +349,7 @@ public: virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, CosNaming::BindingIterator_out &bi - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Returns at most the requested number of bindings <how_many> in // <bl>. If the naming context contains additional bindings, they // are returned with a BindingIterator. In the naming context does |