1 files changed, 14 insertions, 14 deletions

diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index 789d5bf9e11..87606c83135 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -141,18 +141,18 @@ main (int argc, char *argv[])
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var server =
-        Test::_narrow (object.in (), ACE_TRY_ENV);
+        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -164,13 +164,13 @@ main (int argc, char *argv[])
         }
 
       // Obtain Priority Mapping used by the ORB.
-      object = orb->resolve_initial_references ("PriorityMappingManager",
-                                                ACE_TRY_ENV);
+      object = orb->resolve_initial_references ("PriorityMappingManager"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in (),
-                                              ACE_TRY_ENV);
+        RTCORBA::PriorityMappingManager::_narrow (object.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (mapping_manager.in ()))
@@ -222,7 +222,7 @@ main (int argc, char *argv[])
         }
       throughput.dump_results ("Aggregated", gsf);
 
-      server->shutdown ("", ACE_TRY_ENV);
+      server->shutdown ("" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -285,12 +285,12 @@ Client::svc (void)
       for (int j = 0; j < 100; ++j)
         {
           /*    CORBA::PolicyList_var pols;
-          server_->_validate_connection (pols.out (),
-                                         ACE_TRY_ENV);
+          server_->_validate_connection (pols.out ()
+                                         TAO_ENV_ARG_PARAMETER);
           */
 
-          server_->test_method (this->id_,
-                                ACE_TRY_ENV);
+          server_->test_method (this->id_
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -304,8 +304,8 @@ Client::svc (void)
           ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
           // Invoke method.
-          server_->test_method (this->id_,
-                                ACE_TRY_ENV);
+          server_->test_method (this->id_
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Grab timestamp again.