diff options
Diffstat (limited to 'TAO/tests/Faults/ping.cpp')
| -rw-r--r-- | TAO/tests/Faults/ping.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp index cc21f45d8cd..3f571087e52 100644 --- a/TAO/tests/Faults/ping.cpp +++ b/TAO/tests/Faults/ping.cpp @@ -39,22 +39,22 @@ 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 poa_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 (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_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; // create child poa with PERSISTENT policy @@ -62,25 +62,25 @@ main (int argc, char *argv[]) CORBA::PolicyList policies; policies.length (2); policies[0] = - root_poa->create_lifespan_policy(PortableServer::PERSISTENT, - ACE_TRY_ENV); + root_poa->create_lifespan_policy(PortableServer::PERSISTENT + TAO_ENV_ARG_PARAMETER); policies[1] = - root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION, - ACE_TRY_ENV); + root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var persistent_poa = root_poa->create_POA("persistent", poa_manager.in (), - policies, - ACE_TRY_ENV); + policies + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policies[0]->destroy (ACE_TRY_ENV); + policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - policies[1]->destroy (ACE_TRY_ENV); + policies[1]->destroy (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; if (parse_args (argc, argv) != 0) @@ -90,11 +90,11 @@ main (int argc, char *argv[]) persistent_poa.in ()); PingObject_var server = - server_impl._this (ACE_TRY_ENV); + server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in (), ACE_TRY_ENV); + orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -112,15 +112,15 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - persistent_poa->destroy (1, 1, ACE_TRY_ENV); + persistent_poa->destroy (1, 1 TAO_ENV_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; } ACE_CATCHANY |