Merged corba-env-clean branch.

1 files changed, 30 insertions, 30 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index 588190fd033..7620c20acae 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -36,11 +36,11 @@ TAO_EC_Reactive_ConsumerControl::~TAO_EC_Reactive_ConsumerControl (void)
 
 void
 TAO_EC_Reactive_ConsumerControl::query_consumers (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_EC_Ping_Consumer worker (this);
-  this->event_channel_->consumer_admin ()->for_each (&worker,
-                                                     ACE_TRY_ENV);
+  this->event_channel_->consumer_admin ()->for_each (&worker
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -55,27 +55,27 @@ TAO_EC_Reactive_ConsumerControl::handle_timeout (
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types,
-                                                     ACE_TRY_ENV);
+        this->policy_current_->get_policy_overrides (types
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::ADD_OVERRIDE
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Query the state of the consumers...
-      this->query_consumers (ACE_TRY_ENV);
+      this->query_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::SET_OVERRIDE
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (ACE_TRY_ENV);
+          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -101,13 +101,13 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("PolicyCurrent"
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (tmp.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Pre-compute the policy list to the set the right timeout
@@ -121,8 +121,8 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any,
-               ACE_TRY_ENV);
+               any
+                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -144,14 +144,14 @@ TAO_EC_Reactive_ConsumerControl::shutdown (void)
 
 void
 TAO_EC_Reactive_ConsumerControl::consumer_not_exist (
-      TAO_EC_ProxyPushSupplier *proxy,
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_EC_ProxyPushSupplier *proxy
+      TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Consumer %x does not exists\n", long(proxy)));
-      proxy->disconnect_push_supplier (ACE_TRY_ENV);
+      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -166,8 +166,8 @@ TAO_EC_Reactive_ConsumerControl::consumer_not_exist (
 void
 TAO_EC_Reactive_ConsumerControl::system_exception (
       TAO_EC_ProxyPushSupplier *proxy,
-      CORBA::SystemException & /* exception */,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::SystemException & /* exception */
+      TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -181,7 +181,7 @@ TAO_EC_Reactive_ConsumerControl::system_exception (
       //   return;
 
       // Anything else is serious, including timeouts...
-      proxy->disconnect_push_supplier (ACE_TRY_ENV);
+      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -211,25 +211,25 @@ TAO_EC_ConsumerControl_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier
+                            TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        supplier->consumer_non_existent (disconnected,
-                                         ACE_TRY_ENV);
+        supplier->consumer_non_existent (disconnected
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (non_existent && !disconnected)
         {
-          this->control_->consumer_not_exist (supplier, ACE_TRY_ENV);
+          this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
-      this->control_->consumer_not_exist (supplier, ACE_TRY_ENV);
+      this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
@@ -237,7 +237,7 @@ TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier,
       // This is TAO's minor code for a failed connection, we may
       // want to be more lenient in the future..
       // if (transient.minor () == 0x54410085)
-      this->control_->consumer_not_exist (supplier, ACE_TRY_ENV);
+      this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY