1 files changed, 27 insertions, 27 deletions

diff --git a/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp b/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp
index 58ed597e2ec..96e5401bc90 100644
--- a/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp
@@ -20,23 +20,23 @@ TAO_WstringDef_i::~TAO_WstringDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_WstringDef_i::def_kind (CORBA::Environment &)
+TAO_WstringDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Wstring;
 }
 
-void 
-TAO_WstringDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_WstringDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_WstringDef_i::destroy_i (CORBA::Environment &)
+void
+TAO_WstringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
@@ -49,37 +49,37 @@ TAO_WstringDef_i::destroy_i (CORBA::Environment &)
                                           0);
 }
 
-CORBA::TypeCode_ptr 
-TAO_WstringDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_WstringDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_WstringDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_WstringDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::ULong bound = this->bound_i (ACE_TRY_ENV);
+  CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->repo_->tc_factory ()->create_wstring_tc (bound,
-                                                        ACE_TRY_ENV);
+  return this->repo_->tc_factory ()->create_wstring_tc (bound
+                                                        TAO_ENV_ARG_PARAMETER);
 }
-CORBA::ULong 
-TAO_WstringDef_i::bound (CORBA::Environment &ACE_TRY_ENV)
+CORBA::ULong
+TAO_WstringDef_i::bound (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->bound_i (ACE_TRY_ENV);
+  return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
-CORBA::ULong 
-TAO_WstringDef_i::bound_i (CORBA::Environment &)
+CORBA::ULong
+TAO_WstringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int retval = 0;
@@ -90,20 +90,20 @@ TAO_WstringDef_i::bound_i (CORBA::Environment &)
   return ACE_static_cast (CORBA::ULong, retval);
 }
 
-void 
-TAO_WstringDef_i::bound (CORBA::ULong bound,
-                         CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_WstringDef_i::bound (CORBA::ULong bound
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->bound_i (bound,
-                 ACE_TRY_ENV);
+  this->bound_i (bound
+                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_WstringDef_i::bound_i (CORBA::ULong bound,
-                           CORBA::Environment &)
+void
+TAO_WstringDef_i::bound_i (CORBA::ULong bound
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,