diff options
Diffstat (limited to 'TAO/tests/Leader_Followers/client.cpp')
-rw-r--r-- | TAO/tests/Leader_Followers/client.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp index dc53a97fae9..ca19357f5dd 100644 --- a/TAO/tests/Leader_Followers/client.cpp +++ b/TAO/tests/Leader_Followers/client.cpp @@ -109,7 +109,7 @@ public: int svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -134,8 +134,8 @@ public: "Client: Invoking server from thread %t for time %d @ %T\n", work_from_this_thread)); - CORBA::ULong result = this->test_->method (work_from_this_thread, - ACE_TRY_ENV); + CORBA::ULong result = this->test_->method (work_from_this_thread + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (work_from_this_thread != result) @@ -185,7 +185,7 @@ public: int svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -205,7 +205,7 @@ public: ACE_Time_Value timeout (0, event_loop_timeout_for_this_thread * 1000); - this->orb_->run (timeout, ACE_TRY_ENV); + this->orb_->run (timeout TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Client: Event loop finished for thread %t @ %T\n")); @@ -237,7 +237,7 @@ private: int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -245,8 +245,8 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -256,12 +256,12 @@ main (int argc, char **argv) // Get an object reference from the argument string. CORBA::Object_var object = - orb->string_to_object (IOR, ACE_TRY_ENV); + orb->string_to_object (IOR TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to narrow the object reference to a <server> reference. - test_var server = test::_narrow (object.in (), - ACE_TRY_ENV); + test_var server = test::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Client_Task client_task (server.in ()); @@ -292,7 +292,7 @@ main (int argc, char **argv) // Shutdown server. if (shutdown_server) { - server->shutdown (ACE_TRY_ENV); + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } |