1 files changed, 28 insertions, 22 deletions

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);
 }