1 files changed, 15 insertions, 24 deletions

diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
index 5273788b6de..90a70b66fdb 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
@@ -26,26 +26,25 @@ TAO_EnumDef_i::~TAO_EnumDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_EnumDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EnumDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Enum;
 }
 
 CORBA::TypeCode_ptr
-TAO_EnumDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_EnumDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -58,29 +57,26 @@ TAO_EnumDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "name",
                                             name);
 
-  CORBA::EnumMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::EnumMemberSeq_var members = this->members_i ();
 
   return this->repo_->tc_factory ()->create_enum_tc (id.c_str (),
                                                      name.c_str (),
-                                                     members.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     members.in ());
 }
 
 CORBA::EnumMemberSeq *
-TAO_EnumDef_i::members (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::members (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->members_i ();
 }
 
 CORBA::EnumMemberSeq *
-TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::members_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -92,7 +88,6 @@ TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (retval,
                     CORBA::EnumMemberSeq (count),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   retval->length (count);
 
@@ -117,22 +112,18 @@ TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_EnumDef_i::members (const CORBA::EnumMemberSeq &members
-                        ACE_ENV_ARG_DECL)
+TAO_EnumDef_i::members (const CORBA::EnumMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->members_i (members
-                   ACE_ENV_ARG_PARAMETER);
+  this->members_i (members);
 }
 
 void
-TAO_EnumDef_i::members_i (const CORBA::EnumMemberSeq &members
-                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EnumDef_i::members_i (const CORBA::EnumMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,