diff options
Diffstat (limited to 'TAO/tests/Nested_Event_Loop/client.cpp')
| -rw-r--r-- | TAO/tests/Nested_Event_Loop/client.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp index 4642532075d..4069909cdcb 100644 --- a/TAO/tests/Nested_Event_Loop/client.cpp +++ b/TAO/tests/Nested_Event_Loop/client.cpp @@ -70,7 +70,7 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -78,8 +78,8 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -88,49 +88,49 @@ main (int argc, char **argv) return parse_args_result; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get an object reference from the argument string. - object = orb->string_to_object (IOR, - ACE_TRY_ENV); + object = orb->string_to_object (IOR + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to narrow the object reference to a <server> reference. - server_var server_object = server::_narrow (object.in (), - ACE_TRY_ENV); + server_var server_object = server::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; client_i servant (server_object.in ()); servant.loop (event_loop_depth, - event_loop_iterations, - ACE_TRY_ENV); + event_loop_iterations + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Shutdown server. if (shutdown_server) { - server_object->shutdown (ACE_TRY_ENV); + server_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } root_poa->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |