1 files changed, 20 insertions, 20 deletions

diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
index 44bdfb9e7fd..7b31e7d4f58 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
@@ -5,21 +5,21 @@
 
 void
 Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-                     CORBA::ORB_ptr orb,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     CORBA::ORB_ptr orb
+                     TAO_ENV_ARG_DECL)
 {
   this->orb_ = orb;
 
   // = Connect as a consumer.
   this->consumer_admin_ =
-    event_channel->for_consumers (ACE_TRY_ENV);
+    event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::close (CORBA::Environment &ACE_TRY_ENV)
+Consumer::close (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->disconnect (ACE_TRY_ENV);
+  this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_admin_ =
@@ -27,32 +27,32 @@ Consumer::close (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Consumer::connect (CORBA::Environment &ACE_TRY_ENV)
+Consumer::connect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
   CosEventComm::PushConsumer_var objref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
+    this->consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                ACE_TRY_ENV);
+  this->supplier_proxy_->connect_push_consumer (objref.in ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -60,8 +60,8 @@ Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Consumer::push (const CORBA::Any &,
-                     CORBA::Environment &)
+Consumer::push (const CORBA::Any &
+                     TAO_ENV_ARG_DECL_NOT_USED)
  ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
@@ -74,7 +74,7 @@ Consumer::push (const CORBA::Any &,
 }
 
 void
-Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
  ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -82,15 +82,15 @@ Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }