1 files changed, 35 insertions, 35 deletions

diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index 03b818763a6..997b18880c4 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -12,43 +12,43 @@ CEC_Counting_Consumer::CEC_Counting_Consumer (const char* name)
 }
 
 void
-CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                   CORBA::Environment &ACE_TRY_ENV)
+CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
+                   TAO_ENV_ARG_DECL)
 {
   // The canonical protocol to connect to the EC
 
   CosEventComm::PushConsumer_var consumer =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       this->supplier_proxy_ =
-        consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+        consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  this->supplier_proxy_->connect_push_consumer (consumer.in (),
-                                                ACE_TRY_ENV);
+  this->supplier_proxy_->connect_push_consumer (consumer.in ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CEC_Counting_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+CEC_Counting_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+      this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   PortableServer::POA_var consumer_poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this, ACE_TRY_ENV);
+    consumer_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in (), ACE_TRY_ENV);
+  consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -76,8 +76,8 @@ CEC_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-CEC_Counting_Consumer::push (const CORBA::Any&,
-                             CORBA::Environment &)
+CEC_Counting_Consumer::push (const CORBA::Any&
+                             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->event_count ++;
@@ -93,7 +93,7 @@ CEC_Counting_Consumer::push (const CORBA::Any&,
 }
 
 void
-CEC_Counting_Consumer::disconnect_push_consumer (CORBA::Environment &)
+CEC_Counting_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -111,43 +111,43 @@ CEC_Pull_Counting_Consumer::CEC_Pull_Counting_Consumer (const char* name)
 }
 
 void
-CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                                     CORBA::Environment &ACE_TRY_ENV)
+CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
+                                     TAO_ENV_ARG_DECL)
 {
   // The canonical protocol to connect to the EC
 
   CosEventComm::PullConsumer_var consumer =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       this->supplier_proxy_ =
-        consumer_admin->obtain_pull_supplier (ACE_TRY_ENV);
+        consumer_admin->obtain_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  this->supplier_proxy_->connect_pull_consumer (consumer.in (),
-                                                ACE_TRY_ENV);
+  this->supplier_proxy_->connect_pull_consumer (consumer.in ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+CEC_Pull_Counting_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_pull_supplier (ACE_TRY_ENV);
+      this->supplier_proxy_->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   PortableServer::POA_var consumer_poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this, ACE_TRY_ENV);
+    consumer_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in (), ACE_TRY_ENV);
+  consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -155,19 +155,19 @@ CEC_Pull_Counting_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Consumer::pull (CORBA::Environment &ACE_TRY_ENV)
+CEC_Pull_Counting_Consumer::pull (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       return 0;
     }
   this->event_count++;
-  return this->supplier_proxy_->pull (ACE_TRY_ENV);
+  return this->supplier_proxy_->pull (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event,
-                                      CORBA::Environment &ACE_TRY_ENV)
+CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event
+                                      TAO_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -176,7 +176,7 @@ CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event,
     }
 
   CORBA::Any_var event =
-    this->supplier_proxy_->try_pull (has_event, ACE_TRY_ENV);
+    this->supplier_proxy_->try_pull (has_event TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (has_event)
@@ -206,7 +206,7 @@ CEC_Pull_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect_pull_consumer (CORBA::Environment &)
+CEC_Pull_Counting_Consumer::disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -231,7 +231,7 @@ CEC_Counting_Consumer_Task::svc ()
 {
   ACE_TRY_NEW_ENV
     {
-      this->run (ACE_TRY_ENV);
+      this->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -256,7 +256,7 @@ CEC_Counting_Consumer_Task::pull_count (void)
 }
 
 void
-CEC_Counting_Consumer_Task::run (CORBA::Environment &ACE_TRY_ENV)
+CEC_Counting_Consumer_Task::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Any event;
   event <<= CORBA::Long(0);
@@ -265,8 +265,8 @@ CEC_Counting_Consumer_Task::run (CORBA::Environment &ACE_TRY_ENV)
   do {
     CORBA::Boolean has_event;
     CORBA::Any_var event =
-      this->consumer_->try_pull (has_event,
-                                 ACE_TRY_ENV);
+      this->consumer_->try_pull (has_event
+                                 TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (this->milliseconds_ != 0)