diff options
Diffstat (limited to 'TAO/tests/MT_Client/orb_creation.cpp')
| -rw-r--r-- | TAO/tests/MT_Client/orb_creation.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp index d44016f40f1..97b08f0eb11 100644 --- a/TAO/tests/MT_Client/orb_creation.cpp +++ b/TAO/tests/MT_Client/orb_creation.cpp @@ -81,11 +81,11 @@ main (int argc, char *argv[]) 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; Simple_Server_var server = - Simple_Server::_narrow (object.in (), ACE_TRY_ENV); + Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -107,7 +107,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "threads finished\n")); - server->shutdown (ACE_TRY_ENV); + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -133,7 +133,7 @@ Client::Client (int niterations, int Client::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { for (int i = 0; i < this->niterations_; ++i) @@ -144,15 +144,15 @@ Client::svc (void) CORBA::String_var argv0 = CORBA::string_dup ("dummy_argv"); char* argv[1] = { argv0.inout () }; 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->string_to_object (this->ior_, ACE_TRY_ENV); + orb->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in (), ACE_TRY_ENV); + Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -163,7 +163,7 @@ Client::svc (void) 1); } - server->test_method (ACE_TRY_ENV); + server->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); |