diff options
Diffstat (limited to 'TAO/tests/LongUpcalls/ami_client.cpp')
-rw-r--r-- | TAO/tests/LongUpcalls/ami_client.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp index 4cb612e5fb8..64d285abdd4 100644 --- a/TAO/tests/LongUpcalls/ami_client.cpp +++ b/TAO/tests/LongUpcalls/ami_client.cpp @@ -18,13 +18,13 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; - break; + ior = get_opts.optarg; + break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " - "-k <ior>" + "-k <ior>" "\n", argv [0]), -1); @@ -39,11 +39,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) @@ -52,11 +52,11 @@ main (int argc, char *argv[]) 1); 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; if (parse_args (argc, argv) != 0) @@ -65,14 +65,14 @@ main (int argc, char *argv[]) Controller controller_impl; Test::Controller_var controller = - controller_impl._this (ACE_TRY_ENV); + controller_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - object = orb->string_to_object (ior, ACE_TRY_ENV); + object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Manager_var manager = - Test::Manager::_narrow (object.in (), ACE_TRY_ENV); + Test::Manager::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (manager.in ())) @@ -83,33 +83,33 @@ main (int argc, char *argv[]) Manager_Handler handler_impl (manager.in (), controller.in ()); Test::AMI_ManagerHandler_var handler = - handler_impl._this (ACE_TRY_ENV); + handler_impl._this (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; const CORBA::Short worker_count = 10; manager->sendc_start_workers (handler.in (), worker_count, CORBA::Long (1000), - controller.in (), - ACE_TRY_ENV); + controller.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (30, 0); - orb->run (tv, ACE_TRY_ENV); + orb->run (tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; controller_impl.dump_results (); - manager->shutdown (ACE_TRY_ENV); + manager->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |