Merged corba-env-clean branch.

1 files changed, 53 insertions, 69 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index afe36fc0d1a..7168ed8deb4 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -54,9 +54,8 @@ public:
   // = CosNaming::NamingContext idl interface methods.
 
   virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj,
-                     CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ())
+                     CORBA::Object_ptr obj
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::NotFound,
                      CosNaming::NamingContext::CannotProceed,
@@ -72,9 +71,8 @@ public:
   // participate in name resolution later.
 
   virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj,
-                       CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ())
+                       CORBA::Object_ptr obj
+                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -86,9 +84,8 @@ public:
   // new one.
 
   virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc,
-                             CORBA::Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ())
+                             CosNaming::NamingContext_ptr nc
+                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -100,9 +97,8 @@ public:
   // compound names are passed to be resolved.
 
   virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc,
-                               CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ())
+                               CosNaming::NamingContext_ptr nc
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -111,9 +107,8 @@ public:
   // so that they can participate in name resolution when compound
   // names are passed.
 
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n,
-                                     CORBA::Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ())
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
+                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -124,9 +119,8 @@ public:
   // does not return the type of the object.  Clients are responsible
   // for "narrowing" the object to the appropriate type.
 
-  virtual void unbind (const CosNaming::Name &n,
-                       CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ())
+  virtual void unbind (const CosNaming::Name &n
+                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -137,8 +131,7 @@ public:
   // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
 
   virtual CosNaming::NamingContext_ptr new_context (
-      CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // This operation returns a new naming context implemented by the
@@ -146,9 +139,8 @@ public:
   // context is not bound.
 
   virtual CosNaming::NamingContext_ptr bind_new_context (
-      const CosNaming::Name &n,
-      CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ())
+      const CosNaming::Name &n
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::AlreadyBound,
@@ -161,8 +153,7 @@ public:
   // bound (the name argument excluding the last component).
 
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ())
+  virtual void destroy (TAO_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
@@ -174,9 +165,8 @@ public:
 
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out bl,
-                     CosNaming::BindingIterator_out bi,
-                     CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ())
+                     CosNaming::BindingIterator_out bi
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Returns at most the requested number of bindings <how_many> in
@@ -184,30 +174,26 @@ public:
   // are returned with a BindingIterator.  In the naming context does
   // not contain any additional bindings <bi> returned as null.
 
-  virtual char * to_string (const CosNaming::Name &n,
-                            CORBA::Environment
-                            &ACE_TRY_ENV =
-                            TAO_default_environment ())
+  virtual char * to_string (const CosNaming::Name &n
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::InvalidName));
   // Stringify the name using '\' as the escape character. The
   // characters '.' , '/' and '\' are to be escaped. If the input name
   // is invalid i.e. if the number of characters in the name is zero,
-  // an InvalidName exception is to be raised. 
-  
-  virtual CosNaming::Name * to_name (const char *sn,
-                                   CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ())
+  // an InvalidName exception is to be raised.
+
+  virtual CosNaming::Name * to_name (const char *sn
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::InvalidName));
   // The in parameter is an stringified name. This function removes the
   // escape character '\' and destringifies the stringified name and returns
   // it.
- 
+
   virtual char * to_url ( const char * addr,
-                          const char * sn,
-                          CORBA::Environment &ACE_TRY_ENV = 
-                          TAO_default_environment ()
+                          const char * sn
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS
                           )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -218,10 +204,9 @@ public:
   // and sn refers to the strigified name of the object in that
   // context. This function returns a fully formed URL string like
   // iiopname://1.1@myhost.555xyz.com:9999/a/b/c
-  
-  virtual CORBA::Object_ptr resolve_str (const char * n,
-                                         CORBA::Environment &ACE_TRY_ENV = 
-                                         TAO_default_environment ()
+
+  virtual CORBA::Object_ptr resolve_str (const char * n
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS
                                          )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -230,12 +215,12 @@ public:
                      CosNaming::NamingContext::InvalidName,
                      CosNaming::NamingContext::AlreadyBound
                      ));
-  
+
   // Similar to <resolve> as in the CosNaming::NamingContext interface.
   // It accepts a strigified name as an argument instead of a Name.
-  
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env = TAO_default_environment ());
+
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Returns the Default POA of this Servant object
 
 private:
@@ -266,8 +251,8 @@ private:
   // punctuation.
 
   static size_t to_url_validate_and_compute_size (const char *add,
-                                                  const char *sn,
-                                                  CORBA::Environment &ACE_TRY_ENV);
+                                                  const char *sn
+                                                  TAO_ENV_ARG_DECL);
   // Validate the to_url() method input, and compute the size of the
   // returned URL address.
 
@@ -295,8 +280,8 @@ public:
   // = CosNaming::NamingContext idl interface methods.
 
   virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj,
-                     CORBA::Environment &ACE_TRY_ENV) = 0;
+                     CORBA::Object_ptr obj
+                     TAO_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>,
@@ -306,55 +291,54 @@ public:
   // participate in name resolution later.
 
   virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj,
-                       CORBA::Environment &ACE_TRY_ENV) = 0;
+                       CORBA::Object_ptr obj
+                       TAO_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
   // new one.
 
   virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc,
-                             CORBA::Environment &ACE_TRY_ENV) = 0;
+                             CosNaming::NamingContext_ptr nc
+                             TAO_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,
-                               CORBA::Environment &ACE_TRY_ENV) = 0;
+                               CosNaming::NamingContext_ptr nc
+                               TAO_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,
-                                     CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
+                                     TAO_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
   // does not return the type of the object.  Clients are responsible
   // for "narrowing" the object to the appropriate type.
 
-  virtual void unbind (const CosNaming::Name &n,
-                       CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void unbind (const CosNaming::Name &n
+                       TAO_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 (CORBA::Environment
-                                                    &ACE_TRY_ENV) = 0;
+  virtual CosNaming::NamingContext_ptr new_context (TAO_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,
-                                                         CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n
+                                                         TAO_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 (CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void destroy (TAO_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.
@@ -364,8 +348,8 @@ public:
 
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi,
-                     CORBA::Environment &ACE_TRY_ENV) = 0;
+                     CosNaming::BindingIterator_out &bi
+                     TAO_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