1 files changed, 9 insertions, 18 deletions
diff --git a/CIAO/examples/Null_Component/Null_Component_exec.h b/CIAO/examples/Null_Component/Null_Component_exec.h
index 4bfa913e20d..22026431a93 100644
--- a/CIAO/examples/Null_Component/Null_Component_exec.h
+++ b/CIAO/examples/Null_Component/Null_Component_exec.h
@@ -45,8 +45,7 @@ namespace CIDL_Null_Component_Impl
     // Operations from ::Null_Interface
 
     virtual void
-    null_operation (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    null_operation ()
     ACE_THROW_SPEC (( ::CORBA::SystemException));
   };
 
@@ -65,51 +64,44 @@ namespace CIDL_Null_Component_Impl
     // Port operations.
 
     virtual ::CCM_Null_Interface_ptr
-    get_null_facet (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_null_facet ()
     ACE_THROW_SPEC (( ::CORBA::SystemException));
 
     // Operations from Components::SessionComponent
 
     virtual void
     set_session_context (
-      ::Components::SessionContext_ptr ctx
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ::Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((
                       ::CORBA::SystemException,
                       ::Components::CCMException));
 
     virtual void
-    ciao_preactivate (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
     ACE_THROW_SPEC ((
                       ::CORBA::SystemException,
                       ::Components::CCMException));
 
     virtual void
-    ciao_postactivate (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
     ACE_THROW_SPEC ((
                       ::CORBA::SystemException,
                       ::Components::CCMException));
 
     virtual void
-    ccm_activate (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
     ACE_THROW_SPEC ((
                       ::CORBA::SystemException,
                       ::Components::CCMException));
 
     virtual void
-    ccm_passivate (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
     ACE_THROW_SPEC ((
                       ::CORBA::SystemException,
                       ::Components::CCMException));
 
     virtual void
-    ccm_remove (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
     ACE_THROW_SPEC ((
                       ::CORBA::SystemException,
                       ::Components::CCMException));
@@ -137,8 +129,7 @@ namespace CIDL_Null_Component_Impl
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
     ACE_THROW_SPEC ((
                       ::CORBA::SystemException,
                       ::Components::CCMException));