1 files changed, 16 insertions, 26 deletions

diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
index 2c3d1f8084e..14ca03140b0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
@@ -10,8 +10,8 @@
 #include "Implicit_Deactivator.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-ACE_RCSID (PERF_RTEC, 
-           Loopback_Consumer, 
+ACE_RCSID (PERF_RTEC,
+           Loopback_Consumer,
            "$Id$")
 
 Loopback_Consumer::
@@ -27,12 +27,10 @@ Loopback_Consumer (CORBA::Long experiment_id,
 }
 
 void
-Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                            ACE_ENV_ARG_DECL)
+Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->for_consumers ();
 
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -40,13 +38,11 @@ Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_supplier_ =
-      consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      consumer_admin->obtain_push_supplier ();
   }
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   RtecEventChannelAdmin::ConsumerQOS consumer_qos;
   consumer_qos.is_gateway = 0;
@@ -62,13 +58,11 @@ Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
   h1.type   = this->event_type_;
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
-                                                consumer_qos
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                consumer_qos);
 }
 
 void
-Loopback_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Loopback_Consumer::disconnect (void)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -78,29 +72,25 @@ Loopback_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
     proxy = this->proxy_supplier_._retn ();
   }
 
-  Implicit_Deactivator deactivator (this
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  Implicit_Deactivator deactivator (this);
 
-  ACE_TRY
+  try
     {
-      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->disconnect_push_supplier ();
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception&){}
 }
 
 void
-Loopback_Consumer::push (const RtecEventComm::EventSet &events
-                              ACE_ENV_ARG_DECL)
+Loopback_Consumer::push (const RtecEventComm::EventSet &events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Loopback_Consumer::push (%P|%t)\n"));
-  this->supplier_->push (events ACE_ENV_ARG_PARAMETER);
+  this->supplier_->push (events);
 }
 
 void
-Loopback_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Loopback_Consumer::disconnect_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -109,7 +99,7 @@ Loopback_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 PortableServer::POA_ptr
-Loopback_Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Loopback_Consumer::_default_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());