From c66e1c30e338b5c525dd6bc4ba1a62969e4f2373 Mon Sep 17 00:00:00 2001 From: marina Date: Wed, 7 Apr 1999 18:42:39 +0000 Subject: Updated to use new exceptions macros. --- TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h | 34 +++++++--------- TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp | 50 +++++++++++++----------- TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h | 47 +++++++++++----------- 3 files changed, 68 insertions(+), 63 deletions(-) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index b8bc60c8c07..889abc65c9e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -34,7 +34,8 @@ public: typedef ACE_Hash_Map_Manager HASH_MAP; // = Initialization and termination methods. - TAO_Hash_Naming_Context (PortableServer::POA_ptr poa, + TAO_Hash_Naming_Context (TAO_Naming_Context *interface, + PortableServer::POA_ptr poa, const char *poa_id, size_t default_hash_table_size = ACE_DEFAULT_MAP_SIZE, int root = 0); @@ -47,46 +48,41 @@ public: // = CosNaming::NamingContext idl interface methods. virtual void bind (const CosNaming::Name &n, CORBA::Object_ptr obj, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); virtual void rebind (const CosNaming::Name &n, CORBA::Object_ptr obj, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); virtual void bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); virtual void rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); virtual CORBA::Object_ptr resolve (const CosNaming::Name &n, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); virtual void unbind (const CosNaming::Name &n, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); - virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &IT_env); + virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV); virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); - virtual void destroy (CORBA::Environment &IT_env); + virtual void destroy (CORBA::Environment &ACE_TRY_ENV); virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, CosNaming::BindingIterator_out &bi, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); virtual PortableServer::POA_ptr _default_POA (void); // Returns the Default POA of this Servant object - void interface (TAO_Naming_Context *i); - // Set the pointer to the 'interface' that forwards calls invoked by - // CORBA clients to us. See data member description for the reason - // why we need this pointer. - // = Helper functions. static int populate_binding (TAO_Hash_Naming_Context::HASH_MAP::ENTRY *hash_entry, CosNaming::Binding &b); @@ -168,16 +164,16 @@ public: virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); CORBA::Boolean next_one (CosNaming::Binding_out b, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); // This operation returns the next binding. If there are no more // bindings false is returned. CORBA::Boolean next_n (CORBA::ULong how_many, CosNaming::BindingList_out bl, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); // This operation returns at most the requested number of bindings. - void destroy (CORBA::Environment &IT_env); + void destroy (CORBA::Environment &ACE_TRY_ENV); // This operation destroys the iterator. private: diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp index 7a7d772e22b..74cb7670bca 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp @@ -14,8 +14,8 @@ #include "Naming_Context.h" -TAO_Naming_Context::TAO_Naming_Context (TAO_Naming_Context_Impl *impl) - : impl_ (impl) +TAO_Naming_Context::TAO_Naming_Context (void) + : impl_ (0) { } @@ -24,6 +24,12 @@ TAO_Naming_Context::~TAO_Naming_Context (void) delete impl_; } +void +TAO_Naming_Context::impl (TAO_Naming_Context_Impl *impl) +{ + impl_ = impl; +} + PortableServer::POA_ptr TAO_Naming_Context::_default_POA (CORBA::Environment &/*env*/) { @@ -33,73 +39,73 @@ TAO_Naming_Context::_default_POA (CORBA::Environment &/*env*/) void TAO_Naming_Context::bind (const CosNaming::Name &n, CORBA::Object_ptr obj, - CORBA::Environment &IT_env) + CORBA::Environment &ACE_TRY_ENV) { - impl_->bind (n, obj, IT_env); + impl_->bind (n, obj, ACE_TRY_ENV); } void TAO_Naming_Context::rebind (const CosNaming::Name &n, CORBA::Object_ptr obj, - CORBA::Environment &IT_env) + CORBA::Environment &ACE_TRY_ENV) { - impl_->rebind (n, obj, IT_env); + impl_->rebind (n, obj, ACE_TRY_ENV); } void TAO_Naming_Context::bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc, - CORBA::Environment &IT_env) + CORBA::Environment &ACE_TRY_ENV) { - impl_->bind_context (n, nc, IT_env); + impl_->bind_context (n, nc, ACE_TRY_ENV); } void TAO_Naming_Context::rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc, - CORBA::Environment &IT_env) + CORBA::Environment &ACE_TRY_ENV) { - impl_->rebind_context (n, nc, IT_env); + impl_->rebind_context (n, nc, ACE_TRY_ENV); } CORBA::Object_ptr TAO_Naming_Context::resolve (const CosNaming::Name &n, - CORBA::Environment &IT_env) + CORBA::Environment &ACE_TRY_ENV) { - return impl_->resolve (n, IT_env); + return impl_->resolve (n, ACE_TRY_ENV); } void TAO_Naming_Context::unbind (const CosNaming::Name &n, - CORBA::Environment &IT_env) + CORBA::Environment &ACE_TRY_ENV) { - impl_->unbind (n, IT_env); + impl_->unbind (n, ACE_TRY_ENV); } CosNaming::NamingContext_ptr -TAO_Naming_Context::new_context (CORBA::Environment &IT_env) +TAO_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) { - return impl_->new_context (IT_env); + return impl_->new_context (ACE_TRY_ENV); } CosNaming::NamingContext_ptr TAO_Naming_Context::bind_new_context (const CosNaming::Name &n, - CORBA::Environment &IT_env) + CORBA::Environment &ACE_TRY_ENV) { - return impl_->bind_new_context (n, IT_env); + return impl_->bind_new_context (n, ACE_TRY_ENV); } void -TAO_Naming_Context::destroy (CORBA::Environment &IT_env) +TAO_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV) { - impl_->destroy (IT_env); + impl_->destroy (ACE_TRY_ENV); } void TAO_Naming_Context::list (CORBA::ULong how_many, CosNaming::BindingList_out bl, CosNaming::BindingIterator_out bi, - CORBA::Environment &IT_env) + CORBA::Environment &ACE_TRY_ENV) { - impl_->list (how_many, bl, bi, IT_env); + impl_->list (how_many, bl, bi, ACE_TRY_ENV); } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h index f5053530831..8cb611da717 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h @@ -36,17 +36,20 @@ class TAO_ORBSVCS_Export TAO_Naming_Context : public POA_CosNaming::NamingContex public: // = Initialization and termination methods. - TAO_Naming_Context (TAO_Naming_Context_Impl *impl); - // Constructor - initialize with a concrete implementation. + TAO_Naming_Context (void); + // Constructor. ~TAO_Naming_Context (void); // destructor. + void impl (TAO_Naming_Context_Impl *impl); + // Initialize with a concrete implementation. + // = CosNaming::NamingContext idl interface methods. virtual void bind (const CosNaming::Name &n, CORBA::Object_ptr obj, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); // Create a binding for name and object in the naming // context. Compound names are treated as follows: ctx->bind (, obj) = (ctx->resolve ())->bind (, @@ -57,7 +60,7 @@ public: virtual void rebind (const CosNaming::Name &n, CORBA::Object_ptr obj, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); // This is similar to 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 @@ -65,20 +68,20 @@ public: virtual void bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); // This is the version of 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, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); // This is a version of 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, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); // Return object reference that is bound to the name. Compound name // resolve is defined as follows: ctx->resolve () = // ctx->resolve ()->resolve () The naming service @@ -86,25 +89,25 @@ public: // for "narrowing" the object to the appropriate type. virtual void unbind (const CosNaming::Name &n, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); // Remove the name binding from the context. When compound names // are used, unbind is defined as follows: ctx->unbind () = (ctx->resolve ())->unbind () virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment - &IT_env); + &ACE_TRY_ENV); // 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, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); // 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 (CORBA::Environment &IT_env); + virtual void destroy (CORBA::Environment &ACE_TRY_ENV); // Delete the naming context. NOTE: the user should any // bindings in which the given context is bound to some names before // invoking operation on it. @@ -113,7 +116,7 @@ public: virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out bl, CosNaming::BindingIterator_out bi, - CORBA::Environment &IT_env); + CORBA::Environment &ACE_TRY_ENV); // Returns at most the requested number of bindings in // . If the naming context contains additional bindings, they // are returned with a BindingIterator. In the naming context does @@ -144,7 +147,7 @@ public: virtual void bind (const CosNaming::Name &n, CORBA::Object_ptr obj, - CORBA::Environment &IT_env) = 0; + CORBA::Environment &ACE_TRY_ENV) = 0; // Create a binding for name and object in the naming // context. Compound names are treated as follows: ctx->bind (, obj) = (ctx->resolve ())->bind (, @@ -155,7 +158,7 @@ public: virtual void rebind (const CosNaming::Name &n, CORBA::Object_ptr obj, - CORBA::Environment &IT_env) = 0; + CORBA::Environment &ACE_TRY_ENV) = 0; // This is similar to 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 @@ -163,20 +166,20 @@ public: virtual void bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc, - CORBA::Environment &IT_env) = 0; + CORBA::Environment &ACE_TRY_ENV) = 0; // This is the version of 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, - CORBA::Environment &IT_env) = 0; + CORBA::Environment &ACE_TRY_ENV) = 0; // This is a version of 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, - CORBA::Environment &IT_env) = 0; + CORBA::Environment &ACE_TRY_ENV) = 0; // Return object reference that is bound to the name. Compound name // resolve is defined as follows: ctx->resolve () = // ctx->resolve ()->resolve () The naming service @@ -184,25 +187,25 @@ public: // for "narrowing" the object to the appropriate type. virtual void unbind (const CosNaming::Name &n, - CORBA::Environment &IT_env) = 0; + CORBA::Environment &ACE_TRY_ENV) = 0; // Remove the name binding from the context. When compound names // are used, unbind is defined as follows: ctx->unbind () = (ctx->resolve ())->unbind () virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment - &IT_env) = 0; + &ACE_TRY_ENV) = 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, - CORBA::Environment &IT_env) = 0; + CORBA::Environment &ACE_TRY_ENV) = 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 (CORBA::Environment &IT_env) = 0; + virtual void destroy (CORBA::Environment &ACE_TRY_ENV) = 0; // Delete the naming context. NOTE: the user should any // bindings in which the given context is bound to some names before // invoking operation on it. @@ -211,7 +214,7 @@ public: virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, CosNaming::BindingIterator_out &bi, - CORBA::Environment &IT_env) = 0; + CORBA::Environment &ACE_TRY_ENV) = 0; // Returns at most the requested number of bindings in // . If the naming context contains additional bindings, they // are returned with a BindingIterator. In the naming context does -- cgit v1.2.1