1 files changed, 10 insertions, 20 deletions

diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
index 59cfc9cd251..b1d3bb54051 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
@@ -9,47 +9,41 @@ Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel
 {
   // = Connect as a consumer.
   this->supplier_admin_ =
-    event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    event_channel->for_suppliers ();
 }
 
 void
-Supplier::close (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::close (void)
 {
-  this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->disconnect ();
 
   this->supplier_admin_ =
     CosEventChannelAdmin::SupplierAdmin::_nil ();
 }
 
 void
-Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::connect (void)
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
   this->consumer_proxy_ =
-    this->supplier_admin_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->supplier_admin_->obtain_push_consumer ();
 
-  CosEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosEventComm::PushSupplier_var objref = this->_this ();
 
   this->consumer_proxy_->connect_push_supplier (objref.in ()
                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (void)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ())
       || CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->disconnect_push_consumer ();
 
   this->consumer_proxy_ =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -60,11 +54,10 @@ Supplier::send_event (const CORBA::Any & data
                            ACE_ENV_ARG_DECL)
 {
   this->consumer_proxy_->push (data ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect_push_supplier (void)
  ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -72,15 +65,12 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   poa->deactivate_object (id.in ()
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }