1 files changed, 25 insertions, 25 deletions

diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
index 75634dcfc3c..cb2a02f80c8 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -44,19 +44,19 @@ Consumer::parse_args (int argc, char *argv [])
 }
 
 void
-Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-                     CORBA::Environment& ACE_TRY_ENV)
+Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel
+                     TAO_ENV_ARG_DECL)
 {
   // = 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_ =
@@ -64,32 +64,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_ =
@@ -97,8 +97,8 @@ Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Consumer::push (const CORBA::Any &,
-                     CORBA::Environment &ACE_TRY_ENV)
+Consumer::push (const CORBA::Any &
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
@@ -121,7 +121,7 @@ Consumer::push (const CORBA::Any &,
                   "(%P):%s\n",
                   "exiting the consumer."));
 
-      this->close (ACE_TRY_ENV);
+      this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->shutdown ();
@@ -129,7 +129,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
       ))
@@ -137,30 +137,30 @@ 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;
 }
 
 int
 Consumer::init_Consumer (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
    {
-      this->open (this->cos_ec_,
-                  ACE_TRY_ENV);
+      this->open (this->cos_ec_
+                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->connect (ACE_TRY_ENV);
+      this->connect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY