diff options
Diffstat (limited to 'TAO/tests/Oneways_Invoking_Twoways/client.cpp')
| -rw-r--r-- | TAO/tests/Oneways_Invoking_Twoways/client.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp index 3428a3604f7..49526d4786c 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp @@ -40,11 +40,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 poa_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 (poa_object.in ())) @@ -53,11 +53,11 @@ main (int argc, char *argv[]) 1); 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; if (parse_args (argc, argv) != 0) @@ -65,11 +65,11 @@ main (int argc, char *argv[]) // Get the sender reference.. CORBA::Object_var tmp = - orb->string_to_object(ior, ACE_TRY_ENV); + orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Sender_var sender = - Test::Sender::_narrow(tmp.in (), ACE_TRY_ENV); + Test::Sender::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (sender.in ())) @@ -90,11 +90,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl); Test::Receiver_var receiver = - receiver_impl->_this (ACE_TRY_ENV); + receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Activate poa manager - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Client_Task client_task (sender.in (), @@ -106,7 +106,7 @@ main (int argc, char *argv[]) // Before creating threads we will let the sender know that we // will have two threads that would make invocations.. - sender->active_objects ((CORBA::Short) 2, ACE_TRY_ENV); + sender->active_objects ((CORBA::Short) 2 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (server_task.activate (THR_NEW_LWP | THR_JOINABLE, 2,1) == -1) @@ -124,7 +124,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Event Loop finished \n")); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |