diff options
Diffstat (limited to 'TAO/tests/Oneways_Invoking_Twoways')
-rw-r--r-- | TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp | 6 | ||||
-rw-r--r-- | TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp | 6 | ||||
-rw-r--r-- | TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h | 4 | ||||
-rw-r--r-- | TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp | 12 | ||||
-rw-r--r-- | TAO/tests/Oneways_Invoking_Twoways/Sender_i.h | 10 | ||||
-rw-r--r-- | TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp | 4 | ||||
-rw-r--r-- | TAO/tests/Oneways_Invoking_Twoways/client.cpp | 20 | ||||
-rw-r--r-- | TAO/tests/Oneways_Invoking_Twoways/server.cpp | 18 |
8 files changed, 40 insertions, 40 deletions
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp index 1a546611b1e..60599eb6d4c 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp @@ -21,7 +21,7 @@ Client_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { for (int i = 0; i != 1; ++i) @@ -29,8 +29,8 @@ Client_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) sending oneways...\n")); - this->sender_->send_ready_message (this->us_.in (), - ACE_TRY_ENV); + this->sender_->send_ready_message (this->us_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp index 9f4e8c8f0ff..a615bc0fa09 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp @@ -19,20 +19,20 @@ Receiver_i::~Receiver_i (void) CORBA::Long -Receiver_i::receive_call (CORBA::Environment &ACE_TRY_ENV) +Receiver_i::receive_call (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Doing a ping... \n")); - this->sender_->ping (ACE_TRY_ENV); + this->sender_->ping (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return this->no_calls_++; } CORBA::Long -Receiver_i::get_call_count (CORBA::Environment & /*ACE_TRY_ENV*/) +Receiver_i::get_call_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->iteration_; diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h index 4293dac976b..bc133c6d926 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h @@ -41,11 +41,11 @@ public: virtual ~Receiver_i (void); // = The skeleton methods - virtual CORBA::Long receive_call (CORBA::Environment &ACE_TRY_ENV) + virtual CORBA::Long receive_call (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Retun the number of calls that every thread would make... - virtual CORBA::Long get_call_count (CORBA::Environment &ACE_TRY_ENV) + virtual CORBA::Long get_call_count (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp index 035dae27f42..43f09655404 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp @@ -15,8 +15,8 @@ Sender_i::~Sender_i (void) } void -Sender_i::active_objects (CORBA::Short no_threads, - CORBA::Environment & /*ACE_TRY_ENV */ ) +Sender_i::active_objects (CORBA::Short no_threads + TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->active_objects_ = no_threads; @@ -24,8 +24,8 @@ Sender_i::active_objects (CORBA::Short no_threads, void -Sender_i::send_ready_message (Test::Receiver_ptr receiver, - CORBA::Environment &ACE_TRY_ENV) +Sender_i::send_ready_message (Test::Receiver_ptr receiver + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -38,14 +38,14 @@ Sender_i::send_ready_message (Test::Receiver_ptr receiver, i < this->number_; ++i) { - receiver->receive_call (ACE_TRY_ENV); + receiver->receive_call (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } void -Sender_i::ping (CORBA::Environment & /*ACE_TRY_ENV*/) +Sender_i::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { return; diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h index 6b51ce92b1c..b878806fb08 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h @@ -41,15 +41,15 @@ public: virtual ~Sender_i (void); // = The skeleton methods - virtual void active_objects (CORBA::Short ao, - CORBA::Environment &ACE_TRY_ENV) + virtual void active_objects (CORBA::Short ao + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_ready_message (Test::Receiver_ptr receiver, - CORBA::Environment &ACE_TRY_ENV) + virtual void send_ready_message (Test::Receiver_ptr receiver + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void ping (CORBA::Environment &ACE_TRY_ENV) + virtual void ping (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp index 0b96b4f366f..1338704fc0d 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp @@ -17,12 +17,12 @@ int Server_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // run the test for at most 60 seconds... ACE_Time_Value tv (60, 0); - this->orb_->run (tv, ACE_TRY_ENV); + this->orb_->run (tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY 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 diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp index 7a24398d2ff..c69f94b9103 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp @@ -39,11 +39,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 ())) @@ -52,11 +52,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) @@ -70,11 +70,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(sender_impl); Test::Sender_var sender = - sender_impl->_this (ACE_TRY_ENV); + sender_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (sender.in (), ACE_TRY_ENV); + orb->object_to_string (sender.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -87,7 +87,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Server_Task server_task (orb.in (), @@ -101,10 +101,10 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Now terminating test\n")); - 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 |