1 files changed, 27 insertions, 53 deletions

diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
index f11a2850319..c8b9bbf4a30 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
@@ -51,127 +51,101 @@ public:
   virtual ~TAO_OperationDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe ()
     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)
+  virtual CORBA::Contained::Description *describe_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr result (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr result ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr result_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr result_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::IDLType_ptr result_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr result_def ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr result_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr result_def_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void result_def (
-      CORBA::IDLType_ptr result_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr result_def)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result_def_i (
-      CORBA::IDLType_ptr result_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr result_def)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ParDescriptionSeq *params (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ParDescriptionSeq *params ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ParDescriptionSeq *params_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ParDescriptionSeq *params_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void params (
-      const CORBA::ParDescriptionSeq &params
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ParDescriptionSeq &params)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void params_i (
-      const CORBA::ParDescriptionSeq &params
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ParDescriptionSeq &params)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::OperationMode mode (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::OperationMode mode ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::OperationMode mode_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::OperationMode mode_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void mode (
-      CORBA::OperationMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::OperationMode mode)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void mode_i (
-      CORBA::OperationMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::OperationMode mode)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ContextIdSeq *contexts (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ContextIdSeq *contexts ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ContextIdSeq *contexts_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ContextIdSeq *contexts_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void contexts (
-      const CORBA::ContextIdSeq &contexts
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ContextIdSeq &contexts)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void contexts_i (
-      const CORBA::ContextIdSeq &contexts
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ContextIdSeq &contexts)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ExceptionDefSeq *exceptions (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ExceptionDefSeq *exceptions ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ExceptionDefSeq *exceptions_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ExceptionDefSeq *exceptions_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void exceptions (
-      const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ExceptionDefSeq &exceptions)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void exceptions_i (
-      const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ExceptionDefSeq &exceptions)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Common code for containers to call in
   // making descriptions.
 
-  void make_description (CORBA::OperationDescription &desc
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void make_description (CORBA::OperationDescription &desc)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr type_i (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr type_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };