1 files changed, 14 insertions, 12 deletions

diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp
index bb72eb05cca..bac145852a7 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp
@@ -12,7 +12,9 @@
 #include "ace/Sample_History.h"
 #include "ace/Basic_Stats.h"
 
-ACE_RCSID(EC_Federated_Latency, Coordinator, "$Id$")
+ACE_RCSID (EC_Federated_Latency,
+           Coordinator,
+           "$Id$")
 
 ECFL_Coordinator::ECFL_Coordinator (int peers_expected,
                                     int iterations,
@@ -34,8 +36,8 @@ ECFL_Coordinator::~ECFL_Coordinator (void)
 }
 
 void
-ECFL_Coordinator::join (Control::Peer_ptr peer,
-                        CORBA::Environment &ACE_TRY_ENV)
+ECFL_Coordinator::join (Control::Peer_ptr peer
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
@@ -57,14 +59,14 @@ ECFL_Coordinator::join (Control::Peer_ptr peer,
   for (i = 0; i != this->peers_count_; ++i)
     {
       RtecEventChannelAdmin::EventChannel_var channel =
-        this->peers_[i]->channel (ACE_TRY_ENV);
+        this->peers_[i]->channel (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       for (size_t j = 0; j != this->peers_count_; ++j)
         {
           if (i != j)
             {
-              this->peers_[j]->connect (channel.in (), ACE_TRY_ENV);
+              this->peers_[j]->connect (channel.in () TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -89,8 +91,8 @@ ECFL_Coordinator::join (Control::Peer_ptr peer,
           if (j != i)
             {
               loopbacks[lcount++] =
-                this->peers_[j]->setup_loopback (experiment_id,
-                                                 ACE_TRY_ENV);
+                this->peers_[j]->setup_loopback (experiment_id
+                                                 TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -98,13 +100,13 @@ ECFL_Coordinator::join (Control::Peer_ptr peer,
       Control::Samples_var samples =
         this->peers_[i]->run_experiment (experiment_id,
                                          this->iterations_,
-                                         gsf,
-                                         ACE_TRY_ENV);
+                                         gsf
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       for (j = 0; j != lcount; ++j)
         {
-          loopbacks[j]->destroy (ACE_TRY_ENV);
+          loopbacks[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -125,10 +127,10 @@ ECFL_Coordinator::join (Control::Peer_ptr peer,
 
   for (i = 0; i != this->peers_count_; ++i)
     {
-      this->peers_[i]->shutdown (ACE_TRY_ENV);
+      this->peers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }