diff options
Diffstat (limited to 'TAO/tests/Client_Leaks/child.cpp')
-rw-r--r-- | TAO/tests/Client_Leaks/child.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp index b0205868b58..b2d66aae41a 100644 --- a/TAO/tests/Client_Leaks/child.cpp +++ b/TAO/tests/Client_Leaks/child.cpp @@ -11,14 +11,14 @@ 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; if (argc < 2) { // Paranoia, we should have an auto_ptr-like gadget for // this. - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ERROR_RETURN ((LM_ERROR, @@ -27,10 +27,10 @@ main (int argc, char *argv[]) } CORBA::Object_var object = - orb->string_to_object (argv[1], ACE_TRY_ENV); + orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Startup_Callback_var startup_callback = - Test::Startup_Callback::_narrow (object.in (), ACE_TRY_ENV); + Test::Startup_Callback::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (startup_callback.in ())) { @@ -40,11 +40,11 @@ main (int argc, char *argv[]) } 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; if (CORBA::is_nil (root_poa.in ())) @@ -53,7 +53,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Process *process_impl; @@ -63,23 +63,23 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(process_impl); Test::Process_var process = - process_impl->_this (ACE_TRY_ENV); + process_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; - startup_callback->started (process.in (), ACE_TRY_ENV); + startup_callback->started (process.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (50, 0); - orb->run (tv, ACE_TRY_ENV); + orb->run (tv 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; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |