1 files changed, 30 insertions, 55 deletions

diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index a00607b040b..3a60fabd759 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -13,44 +13,35 @@ CEC_Counting_Consumer::CEC_Counting_Consumer (const char* name)
 }
 
 void
-CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                   ACE_ENV_ARG_DECL)
+CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   // The canonical protocol to connect to the EC
 
   CosEventComm::PushConsumer_var consumer =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       this->supplier_proxy_ =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        consumer_admin->obtain_push_supplier ();
     }
 
-  this->supplier_proxy_->connect_push_consumer (consumer.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_proxy_->connect_push_consumer (consumer.in ());
 }
 
 void
-CEC_Counting_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Counting_Consumer::disconnect (void)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->supplier_proxy_->disconnect_push_supplier ();
     }
 
   PortableServer::POA_var consumer_poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_poa->servant_to_id (this);
+  consumer_poa->deactivate_object (consumer_id.in ());
 
   this->supplier_proxy_ =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -77,8 +68,7 @@ CEC_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-CEC_Counting_Consumer::push (const CORBA::Any&
-                             ACE_ENV_ARG_DECL_NOT_USED)
+CEC_Counting_Consumer::push (const CORBA::Any&)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->event_count ++;
@@ -94,7 +84,7 @@ CEC_Counting_Consumer::push (const CORBA::Any&
 }
 
 void
-CEC_Counting_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CEC_Counting_Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -112,63 +102,53 @@ CEC_Pull_Counting_Consumer::CEC_Pull_Counting_Consumer (const char* name)
 }
 
 void
-CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                                     ACE_ENV_ARG_DECL)
+CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   // The canonical protocol to connect to the EC
 
   CosEventComm::PullConsumer_var consumer =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       this->supplier_proxy_ =
-        consumer_admin->obtain_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        consumer_admin->obtain_pull_supplier ();
     }
 
-  this->supplier_proxy_->connect_pull_consumer (consumer.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_proxy_->connect_pull_consumer (consumer.in ());
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Pull_Counting_Consumer::disconnect (void)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->supplier_proxy_->disconnect_pull_supplier ();
     }
 
   PortableServer::POA_var consumer_poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_poa->servant_to_id (this);
+  consumer_poa->deactivate_object (consumer_id.in ());
 
   this->supplier_proxy_ =
     CosEventChannelAdmin::ProxyPullSupplier::_nil ();
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Consumer::pull (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Pull_Counting_Consumer::pull (void)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       return 0;
     }
   this->event_count++;
-  return this->supplier_proxy_->pull (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->supplier_proxy_->pull ();
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event
-                                      ACE_ENV_ARG_DECL)
+CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -177,8 +157,7 @@ CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event
     }
 
   CORBA::Any_var event =
-    this->supplier_proxy_->try_pull (has_event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->supplier_proxy_->try_pull (has_event);
 
   if (has_event)
     this->event_count++;
@@ -207,7 +186,7 @@ CEC_Pull_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CEC_Pull_Counting_Consumer::disconnect_pull_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -230,16 +209,14 @@ CEC_Counting_Consumer_Task::
 int
 CEC_Counting_Consumer_Task::svc ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -257,7 +234,7 @@ CEC_Counting_Consumer_Task::pull_count (void)
 }
 
 void
-CEC_Counting_Consumer_Task::run (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Counting_Consumer_Task::run (void)
 {
   CORBA::Any event;
   event <<= CORBA::Long(0);
@@ -266,9 +243,7 @@ CEC_Counting_Consumer_Task::run (ACE_ENV_SINGLE_ARG_DECL)
   do {
     CORBA::Boolean has_event;
     CORBA::Any_var event =
-      this->consumer_->try_pull (has_event
-                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->consumer_->try_pull (has_event);
 
     if (this->milliseconds_ != 0)
       {