1 files changed, 15 insertions, 18 deletions

diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
index f9789c4282b..2443d8c68f9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
@@ -3,8 +3,8 @@
 #include "orbsvcs/IFRService/Repository_i.h"
 #include "orbsvcs/IFRService/PrimitiveDef_i.h"
 
-ACE_RCSID (IFRService, 
-           PrimitiveDef_i, 
+ACE_RCSID (IFRService,
+           PrimitiveDef_i,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -22,41 +22,39 @@ TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_PrimitiveDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrimitiveDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Primitive;
 }
 
 void
-TAO_PrimitiveDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PrimitiveDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_PrimitiveDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PrimitiveDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+  throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 }
 
 CORBA::TypeCode_ptr
-TAO_PrimitiveDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PrimitiveDef_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_PrimitiveDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrimitiveDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int pkind = 0;
@@ -116,19 +114,18 @@ TAO_PrimitiveDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::PrimitiveKind
-TAO_PrimitiveDef_i::kind (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PrimitiveDef_i::kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::pk_null);
+  this->update_key ();
 
-  return this->kind_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->kind_i ();
 }
 
 CORBA::PrimitiveKind
-TAO_PrimitiveDef_i::kind_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrimitiveDef_i::kind_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int pkind = 0;