1 files changed, 8 insertions, 44 deletions

diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
index 7436829cb68..ed65ff0c98b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
@@ -55,131 +55,108 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::ComponentIR::HomeDef_ptr base_home (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ComponentIR::HomeDef_ptr base_home_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_home (
       CORBA::ComponentIR::HomeDef_ptr base_home
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_home_i (
       CORBA::ComponentIR::HomeDef_ptr base_home
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::InterfaceDefSeq *supported_interfaces (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDefSeq *supported_interfaces_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void supported_interfaces (
       const CORBA::InterfaceDefSeq &supported_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void supported_interfaces_i (
       const CORBA::InterfaceDefSeq &supported_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ComponentIR::ComponentDef_ptr managed_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ComponentIR::ComponentDef_ptr managed_component_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void managed_component (
       CORBA::ComponentIR::ComponentDef_ptr managed_component
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void managed_component_i (
       CORBA::ComponentIR::ComponentDef_ptr managed_component
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ValueDef_ptr primary_key (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ValueDef_ptr primary_key_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void primary_key (
       CORBA::ValueDef_ptr primary_key
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void primary_key_i (
       CORBA::ValueDef_ptr primary_key
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -189,7 +166,6 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -199,7 +175,6 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -209,7 +184,6 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -219,7 +193,6 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -233,48 +206,39 @@ private:
       const char *sub_section,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL
     );
 
   void fill_op_desc_seq (ACE_Configuration_Section_Key &key,
                          CORBA::OpDescriptionSeq &ods,
-                         const char *sub_section
-                         ACE_ENV_ARG_DECL);
+                         const char *sub_section);
 
   void fill_op_desc (ACE_Configuration_Section_Key &key,
                      CORBA::OperationDescription &od,
-                     const char *sub_section
-                     ACE_ENV_ARG_DECL);
+                     const char *sub_section);
 
   void fill_param_desc_seq (ACE_Configuration_Section_Key &key,
                             CORBA::ParDescriptionSeq &pds,
-                            const char *sub_section
-                            ACE_ENV_ARG_DECL);
+                            const char *sub_section);
 
   void fill_param_desc (ACE_Configuration_Section_Key &key,
                         CORBA::ParameterDescription &pd,
-                        const char *sub_section
-                        ACE_ENV_ARG_DECL);
+                        const char *sub_section);
 
   void fill_exc_desc_seq (ACE_Configuration_Section_Key &key,
                           CORBA::ExcDescriptionSeq &eds,
-                          const char *sub_section
-                          ACE_ENV_ARG_DECL);
+                          const char *sub_section);
 
   void fill_exc_desc (ACE_Configuration_Section_Key &key,
                       CORBA::ExceptionDescription &ed,
-                      const char *sub_section
-                      ACE_ENV_ARG_DECL);
+                      const char *sub_section);
 
   void fill_attr_desc_seq (ACE_Configuration_Section_Key &key,
                            CORBA::ExtAttrDescriptionSeq &eads,
-                           const char *sub_section
-                           ACE_ENV_ARG_DECL);
+                           const char *sub_section);
 
   void fill_attr_desc (ACE_Configuration_Section_Key &key,
                        CORBA::ExtAttributeDescription &ead,
-                       const char *sub_section
-                       ACE_ENV_ARG_DECL);
+                       const char *sub_section);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL