1 files changed, 15 insertions, 25 deletions

diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
index 12b3d28ea98..fb92bb2ea66 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
@@ -22,15 +22,14 @@ MyImpl::BMClosedED_exec_i::~BMClosedED_exec_i ()
 // Operations from HUDisplay::BMClosedED
 
 BasicSP::CCM_ReadData_ptr
-MyImpl::BMClosedED_exec_i::get_dataout (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMClosedED_exec_i::get_dataout ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return BasicSP::CCM_ReadData::_duplicate (this);
 }
 
 void
-MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *
-                                          ACE_ENV_ARG_DECL)
+MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -45,20 +44,18 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *
 
   // Refresh position
   BasicSP::ReadData_var dat
-    = this->context_->get_connection_datain (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    = this->context_->get_connection_datain ();
 
   if (CORBA::is_nil (dat.in ()))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "BMClosedED - got nil from get_connection \n"));
 
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+      throw CORBA::BAD_INV_ORDER ();
     }
 
   CORBA::String_var str =
-    dat->get_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    dat->get_data ();
 
   if (CIAO::debug_level () > 0)
     {
@@ -76,15 +73,13 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *
   BasicSP::DataAvailable_var event =
     new OBV_BasicSP::DataAvailable;
 
-  this->context_->push_out_avail (event
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->context_->push_out_avail (event);
 }
 
 // Operations from HUDisplay::position
 
 char *
-MyImpl::BMClosedED_exec_i::get_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMClosedED_exec_i::get_data ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->str_.inout ());
@@ -94,7 +89,6 @@ MyImpl::BMClosedED_exec_i::get_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 MyImpl::BMClosedED_exec_i::set_session_context (
     Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
@@ -106,27 +100,24 @@ MyImpl::BMClosedED_exec_i::set_session_context (
     }
 
   this->context_ =
-    BasicSP::CCM_BMClosedED_Context::_narrow (ctx
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    BasicSP::CCM_BMClosedED_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   // Urm, we actually discard exceptions thown from this operation.
 }
 
 void
-MyImpl::BMClosedED_exec_i::ciao_preactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMClosedED_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::BMClosedED_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMClosedED_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -139,15 +130,14 @@ MyImpl::BMClosedED_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::BMClosedED_exec_i::ciao_postactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMClosedED_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::BMClosedED_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMClosedED_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -157,7 +147,7 @@ MyImpl::BMClosedED_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::BMClosedED_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMClosedED_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -181,7 +171,7 @@ MyImpl::BMClosedEDHome_exec_i::~BMClosedEDHome_exec_i ()
 // Implicit home operations.
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::BMClosedEDHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
+MyImpl::BMClosedEDHome_exec_i::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {