diff options
Diffstat (limited to 'TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp')
| -rw-r--r-- | TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp index cced0e943f0..fc251f64bd0 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp @@ -141,7 +141,7 @@ 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) @@ -149,13 +149,13 @@ main (int argc, char *argv[]) // Obtain Priority Mapping used by the ORB. CORBA::Object_var object = - orb->resolve_initial_references ("PriorityMappingManager", - ACE_TRY_ENV); + 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 ())) @@ -260,11 +260,11 @@ Client::svc (void) priorities[this->id_]); 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 ())) @@ -281,12 +281,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; } @@ -300,8 +300,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. @@ -320,7 +320,7 @@ Client::svc (void) /* char orb_name[50]; ACE_OS::sprintf (orb_name, "%d", priorities[this->id_]); - server->shutdown (orb_name, ACE_TRY_ENV); + server->shutdown (orb_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK;*/ } ACE_CATCHANY |