1 files changed, 13 insertions, 13 deletions

diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp
index e9f793abaf6..e36bdaa2ee9 100644
--- a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp
@@ -18,39 +18,39 @@ TAO_UsesDef_i::~TAO_UsesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_UsesDef_i::def_kind (CORBA::Environment &)
+TAO_UsesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Uses;
 }
 
 void 
-TAO_UsesDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_UsesDef_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_UsesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_UsesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_UsesDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_UsesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_UsesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_UsesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -58,16 +58,16 @@ TAO_UsesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 CORBA_InterfaceDef_ptr 
-TAO_UsesDef_i::interface_type (CORBA::Environment &ACE_TRY_ENV)
+TAO_UsesDef_i::interface_type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ());
 
-  return this->interface_type_i (ACE_TRY_ENV);
+  return this->interface_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDef_ptr 
-TAO_UsesDef_i::interface_type_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_UsesDef_i::interface_type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -75,16 +75,16 @@ TAO_UsesDef_i::interface_type_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 CORBA::Boolean 
-TAO_UsesDef_i::is_multiple (CORBA::Environment &ACE_TRY_ENV)
+TAO_UsesDef_i::is_multiple (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_multiple_i (ACE_TRY_ENV);
+  return this->is_multiple_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Boolean 
-TAO_UsesDef_i::is_multiple_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_UsesDef_i::is_multiple_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO