diff options
Diffstat (limited to 'TAO/tests/RTCORBA/Client_Propagated/client.cpp')
-rw-r--r-- | TAO/tests/RTCORBA/Client_Propagated/client.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp index 28c586f5857..9d893ebf504 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp @@ -54,23 +54,23 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize and obtain reference to the Test object. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_var server = - Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -85,11 +85,11 @@ main (int argc, char *argv[]) // PriorityModelPolicy. CORBA::Policy_var policy = server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityModelPolicy_var priority_policy = - RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (priority_policy.in ())) @@ -98,7 +98,7 @@ main (int argc, char *argv[]) 1); RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (priority_model != RTCORBA::CLIENT_PROPAGATED) @@ -110,18 +110,18 @@ main (int argc, char *argv[]) // Make several invocation, changing the priority of this thread // for each. object = - orb->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->resolve_initial_references ("PriorityMappingManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMappingManager_var mapping_manager = RTCORBA::PriorityMappingManager::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMapping *pm = @@ -145,11 +145,11 @@ main (int argc, char *argv[]) for (int i = 0; i < 3; ++i) { - current->the_priority (desired_priority TAO_ENV_ARG_PARAMETER); + current->the_priority (desired_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Short priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (desired_priority != priority) @@ -159,14 +159,14 @@ main (int argc, char *argv[]) 1); - server->test_method (priority TAO_ENV_ARG_PARAMETER); + server->test_method (priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; desired_priority++; } // Shut down Server ORB. - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::DATA_CONVERSION, ex) |