diff options
Diffstat (limited to 'TAO/tests/Nested_Event_Loop/test_i.cpp')
| -rw-r--r-- | TAO/tests/Nested_Event_Loop/test_i.cpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp index 7e11926ffec..2f1fca6d3e6 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.cpp +++ b/TAO/tests/Nested_Event_Loop/test_i.cpp @@ -12,8 +12,8 @@ server_i::server_i (CORBA::ORB_ptr orb) void server_i::loop (client_ptr remote_partner, CORBA::ULong event_loop_depth, - CORBA::ULong event_loop_iterations, - CORBA::Environment &ACE_TRY_ENV) + CORBA::ULong event_loop_iterations + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -22,28 +22,28 @@ server_i::loop (client_ptr remote_partner, event_loop_iterations)); this->run_no_ops (remote_partner, - event_loop_iterations / 2, - ACE_TRY_ENV); + event_loop_iterations / 2 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (--event_loop_depth != 0) { remote_partner->loop (event_loop_depth, - event_loop_iterations, - ACE_TRY_ENV); + event_loop_iterations + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } this->run_no_ops (remote_partner, - event_loop_iterations / 2, - ACE_TRY_ENV); + event_loop_iterations / 2 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void server_i::run_no_ops (client_ptr remote_partner, - CORBA::ULong iterations, - CORBA::Environment &ACE_TRY_ENV) + CORBA::ULong iterations + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { while (iterations != 0) @@ -71,13 +71,13 @@ server_i::run_no_ops (client_ptr remote_partner, sizeof_pointer_to_flag); remote_partner->oneway_no_op (act_for_iterations, - act_for_flag, - ACE_TRY_ENV); + act_for_flag + TAO_ENV_ARG_PARAMETER); ACE_CHECK; while (!got_reply) { - this->orb_->perform_work (ACE_TRY_ENV); + this->orb_->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -86,8 +86,8 @@ server_i::run_no_ops (client_ptr remote_partner, void server_i::no_op (client_ptr remote_partner, const act &act_for_iterations, - const act &act_for_flag, - CORBA::Environment &ACE_TRY_ENV) + const act &act_for_flag + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong *pointer_to_iterations = 0; @@ -110,16 +110,16 @@ server_i::no_op (client_ptr remote_partner, *pointer_to_flag = 1; - remote_partner->twoway_no_op (ACE_TRY_ENV); + remote_partner->twoway_no_op (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -server_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0, - ACE_TRY_ENV); + this->orb_->shutdown (0 + TAO_ENV_ARG_PARAMETER); } client_i::client_i (server_ptr remote_partner) @@ -129,8 +129,8 @@ client_i::client_i (server_ptr remote_partner) void client_i::loop (CORBA::ULong event_loop_depth, - CORBA::ULong event_loop_iterations, - CORBA::Environment &) + CORBA::ULong event_loop_iterations + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -138,18 +138,18 @@ client_i::loop (CORBA::ULong event_loop_depth, event_loop_depth, event_loop_iterations)); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { client_var self = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->remote_partner_->loop (self.in (), event_loop_depth, - event_loop_iterations, - ACE_TRY_ENV); + event_loop_iterations + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -162,22 +162,22 @@ client_i::loop (CORBA::ULong event_loop_depth, void client_i::oneway_no_op (const act &act_for_iterations, - const act &act_for_flag, - CORBA::Environment &) + const act &act_for_flag + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { client_var self = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->remote_partner_->no_op (self.in (), act_for_iterations, - act_for_flag, - ACE_TRY_ENV); + act_for_flag + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -189,7 +189,7 @@ client_i::oneway_no_op (const act &act_for_iterations, } void -client_i::twoway_no_op (CORBA::Environment &) +client_i::twoway_no_op (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, |