1 files changed, 18 insertions, 18 deletions

diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index 8d723e09ebe..72b4e7a42ac 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -73,7 +73,7 @@ EC_BCast::modify_attributes (TAO_EC_Event_Channel_Attributes&)
 }
 
 void
-EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
+EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_ECG_UDP_Sender sender;
   TAO_ECG_UDP_Out_Endpoint endpoint;
@@ -82,7 +82,7 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
 
   Simple_Address_Server address_server_impl (udp_addr);
   RtecUDPAdmin::AddrServer_var address_server =
-    address_server_impl._this (ACE_TRY_ENV);
+    address_server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (endpoint.dgram ().open (ACE_Addr::sap_any) == -1)
@@ -93,16 +93,16 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
 
   sender.init (this->event_channel_.in (),
                address_server.in (),
-               &endpoint,
-               ACE_TRY_ENV);
+               &endpoint
+               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::ConsumerQOS sub;
   int shutdown_event_type;
-  this->build_consumer_qos (0, sub, shutdown_event_type, ACE_TRY_ENV);
+  this->build_consumer_qos (0, sub, shutdown_event_type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  sender.open (sub, ACE_TRY_ENV);
+  sender.open (sub TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_ECG_UDP_Receiver receiver;
@@ -114,8 +114,8 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
                  &endpoint,
                  address_server.in (),
                  this->orb_->orb_core ()->reactor (),
-                 expire, 5,
-                 ACE_TRY_ENV);
+                 expire, 5
+                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   udp_eh.reactor (this->orb_->orb_core ()->reactor ());
@@ -126,16 +126,16 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
     }
 
   RtecEventChannelAdmin::SupplierQOS pub;
-  this->build_supplier_qos (0, pub, shutdown_event_type, ACE_TRY_ENV);
+  this->build_supplier_qos (0, pub, shutdown_event_type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  receiver.open (pub, ACE_TRY_ENV);
+  receiver.open (pub TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->allocate_tasks () == -1)
     return;
 
-  this->activate_tasks (ACE_TRY_ENV);
+  this->activate_tasks (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
@@ -158,10 +158,10 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "BCast (%P|%t) suppliers finished\n"));
 
-  receiver.close (ACE_TRY_ENV);
+  receiver.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  sender.close (ACE_TRY_ENV);
+  sender.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ Deactivate all the objects...!
@@ -169,12 +169,12 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
   {
     // Deactivate the Address Server
     PortableServer::POA_var poa =
-      address_server_impl._default_POA (ACE_TRY_ENV);
+      address_server_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
     PortableServer::ObjectId_var id =
-      poa->servant_to_id (&address_server_impl, ACE_TRY_ENV);
+      poa->servant_to_id (&address_server_impl 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;
 
     if (this->verbose ())
@@ -199,8 +199,8 @@ Simple_Address_Server (const ACE_INET_Addr& address)
 
 void
 Simple_Address_Server::get_addr (const RtecEventComm::EventHeader&,
-                                 RtecUDPAdmin::UDP_Addr& address,
-                                 CORBA::Environment &)
+                                 RtecUDPAdmin::UDP_Addr& address
+                                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   address = this->address_;