diff options
Diffstat (limited to 'TAO/tests/Faults/pong.cpp')
| -rw-r--r-- | TAO/tests/Faults/pong.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp index 108184cad9e..1066400e786 100644 --- a/TAO/tests/Faults/pong.cpp +++ b/TAO/tests/Faults/pong.cpp @@ -55,8 +55,8 @@ parse_args (int argc, char *argv[]) void run_client (CORBA::ORB_ptr orb, PingObject_ptr server, - PingObject_ptr callback, - CORBA::Environment &ACE_TRY_ENV) + PingObject_ptr callback + TAO_ENV_ARG_DECL) { // Run the client requests in a separate routine to isolate the // exceptions... @@ -68,11 +68,11 @@ run_client (CORBA::ORB_ptr orb, ACE_TRY { reason = "Exception during ping call"; - server->ping (callback, ACE_TRY_ENV); + server->ping (callback TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run for <period> milliseconds, to receive the reply - orb->run (tv, ACE_TRY_ENV); + orb->run (tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Terminate the client if: @@ -83,7 +83,7 @@ run_client (CORBA::ORB_ptr orb, { ACE_DEBUG ((LM_DEBUG, "Shutting down server\n")); reason = "Exception during server shutdown"; - server->shutdown (ACE_TRY_ENV); + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -115,22 +115,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 @@ -138,37 +138,37 @@ 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); ACE_TRY_CHECK; 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) return 1; CORBA::Object_var object = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PingObject_var server = - PingObject::_narrow (object.in (), ACE_TRY_ENV); + PingObject::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -183,21 +183,21 @@ main (int argc, char *argv[]) persistent_poa.in ()); PingObject_var callback = - callback_impl._this (ACE_TRY_ENV); + callback_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it run_client (orb.in (), server.in (), - callback.in (), - ACE_TRY_ENV); + callback.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - 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 |