1 files changed, 10 insertions, 10 deletions

diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp
index 448f9c904de..f6343693d55 100644
--- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp
@@ -20,37 +20,37 @@ TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_PrimitiveDef_i::def_kind (CORBA::Environment &)
+TAO_PrimitiveDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Primitive;
 }
 
 void 
-TAO_PrimitiveDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrimitiveDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_PrimitiveDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrimitiveDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO));
 }
 
 CORBA::TypeCode_ptr 
-TAO_PrimitiveDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrimitiveDef_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_PrimitiveDef_i::type_i (CORBA::Environment &)
+TAO_PrimitiveDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int pkind = 0;
@@ -110,16 +110,16 @@ TAO_PrimitiveDef_i::type_i (CORBA::Environment &)
 }
 
 CORBA::PrimitiveKind 
-TAO_PrimitiveDef_i::kind (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrimitiveDef_i::kind (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null);
 
-  return this->kind_i (ACE_TRY_ENV);
+  return this->kind_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::PrimitiveKind 
-TAO_PrimitiveDef_i::kind_i (CORBA::Environment &)
+TAO_PrimitiveDef_i::kind_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int pkind = 0;