Merged corba-env-clean branch.

1 files changed, 36 insertions, 48 deletions

diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index 3d47595f445..8eec9567baa 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -34,7 +34,7 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_DynamicAny_Export TAO_DynStruct_i 
+class TAO_DynamicAny_Export TAO_DynStruct_i
   : public virtual DynamicAny::DynStruct,
     public virtual TAO_DynCommon,
     public virtual TAO_Local_RefCounted_Object
@@ -52,28 +52,26 @@ public:
   ~TAO_DynStruct_i (void);
   // Destructor.
 
-  void init (CORBA_TypeCode_ptr tc,
-             CORBA::Environment &ACE_TRY_ENV);
+  void init (CORBA_TypeCode_ptr tc
+             TAO_ENV_ARG_DECL);
   // Initialize using just a TypeCode.
 
-  void init (const CORBA_Any& any,
-             CORBA::Environment &ACE_TRY_ENV);
+  void init (const CORBA_Any& any
+             TAO_ENV_ARG_DECL);
   // Initialize using an Any.
 
   // = LocalObject methods.
   static TAO_DynStruct_i *_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
   // = Functions specific to DynStruct.
 
   virtual DynamicAny::FieldName current_member_name (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -81,9 +79,8 @@ public:
       ));
 
   virtual CORBA::TCKind current_member_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -91,18 +88,16 @@ public:
       ));
 
   virtual DynamicAny::NameValuePairSeq *get_members (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void set_members (
-      const DynamicAny::NameValuePairSeq& value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const DynamicAny::NameValuePairSeq& value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -110,18 +105,16 @@ public:
       ));
 
   virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void set_members_as_dyn_any (
-      const DynamicAny::NameDynAnyPairSeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const DynamicAny::NameDynAnyPairSeq & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -131,10 +124,9 @@ public:
   // = DynAny common functions not implemented in class TAO_DynCommon.
 
   virtual void from_any (
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -142,34 +134,30 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::Boolean equal (
-      DynamicAny::DynAny_ptr dyn_any,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      DynamicAny::DynAny_ptr dyn_any
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -177,8 +165,8 @@ public:
 
 private:
   // Check if the typecode is acceptable.
-  void check_typecode (CORBA::TypeCode_ptr tc,
-                       CORBA::Environment &ACE_TRY_ENV);
+  void check_typecode (CORBA::TypeCode_ptr tc
+                       TAO_ENV_ARG_DECL);
 
   // Called by both versions of init().
   void init_common (void);