summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp')
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
index b9d71afb69a..160cf111f80 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
@@ -94,19 +94,19 @@ main (int argc, char *argv[])
"client (%P|%t): sched_params failed\n"));
}
- ACE_TRY_NEW_ENV
+ try
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+ CORBA::ORB_init (argc, argv, "");
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var object =
- orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+ orb->string_to_object (ior);
Test::Roundtrip_var roundtrip =
- Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+ Test::Roundtrip::_narrow (object.in ());
if (CORBA::is_nil (roundtrip.in ()))
{
@@ -119,7 +119,7 @@ main (int argc, char *argv[])
for (int j = 0; j < 100; ++j)
{
ACE_hrtime_t start = 0;
- (void) roundtrip->test_method (start, number ACE_ENV_ARG_PARAMETER);
+ (void) roundtrip->test_method (start, number);
}
ACE_Sample_History history (niterations);
@@ -143,8 +143,7 @@ main (int argc, char *argv[])
}
*/
- (void) roundtrip->test_method (start, number
- ACE_ENV_ARG_PARAMETER);
+ (void) roundtrip->test_method (start, number);
ACE_hrtime_t now = ACE_OS::gethrtime ();
history.sample (now - start);
@@ -177,12 +176,11 @@ main (int argc, char *argv[])
roundtrip->shutdown ();
}
}
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
{
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+ ex._tao_print_exception ("Exception caught:");
return 1;
}
- ACE_ENDTRY;
return 0;
}