diff options
Diffstat (limited to 'TAO/tests/Nested_Event_Loop/test_i.cpp')
| -rw-r--r-- | TAO/tests/Nested_Event_Loop/test_i.cpp | 76 |
1 files changed, 24 insertions, 52 deletions
diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp index 7b27990c225..32603e98df8 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.cpp +++ b/TAO/tests/Nested_Event_Loop/test_i.cpp @@ -13,8 +13,7 @@ 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 - ACE_ENV_ARG_DECL) + CORBA::ULong event_loop_iterations) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -23,28 +22,21 @@ server_i::loop (client_ptr remote_partner, event_loop_iterations)); this->run_no_ops (remote_partner, - event_loop_iterations / 2 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + event_loop_iterations / 2); if (--event_loop_depth != 0) { remote_partner->loop (event_loop_depth, - event_loop_iterations - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + event_loop_iterations); } this->run_no_ops (remote_partner, - event_loop_iterations / 2 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + event_loop_iterations / 2); } void server_i::run_no_ops (client_ptr remote_partner, - CORBA::ULong iterations - ACE_ENV_ARG_DECL) + CORBA::ULong iterations) ACE_THROW_SPEC ((CORBA::SystemException)) { while (iterations != 0) @@ -72,14 +64,11 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; + act_for_flag); while (!got_reply) { - this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_->perform_work (); } } } @@ -87,8 +76,7 @@ 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 - ACE_ENV_ARG_DECL) + const act &act_for_flag) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong *pointer_to_iterations = 0; @@ -111,16 +99,14 @@ server_i::no_op (client_ptr remote_partner, *pointer_to_flag = 1; - remote_partner->twoway_no_op (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + remote_partner->twoway_no_op (); } void -server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } client_i::client_i (server_ptr remote_partner) @@ -130,8 +116,7 @@ client_i::client_i (server_ptr remote_partner) void client_i::loop (CORBA::ULong event_loop_depth, - CORBA::ULong event_loop_iterations - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::ULong event_loop_iterations) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -139,58 +124,45 @@ client_i::loop (CORBA::ULong event_loop_depth, event_loop_depth, event_loop_iterations)); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { client_var self = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_this (); this->remote_partner_->loop (self.in (), event_loop_depth, - event_loop_iterations - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + event_loop_iterations); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in client_i::loop:"); + ex._tao_print_exception ("Exception caught in client_i::loop:"); } - ACE_ENDTRY; } void client_i::oneway_no_op (const act &act_for_iterations, - const act &act_for_flag - ACE_ENV_ARG_DECL_NOT_USED) + const act &act_for_flag) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { client_var self = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_this (); this->remote_partner_->no_op (self.in (), act_for_iterations, - act_for_flag - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + act_for_flag); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in client_i::no_op:"); + ex._tao_print_exception ("Exception caught in client_i::no_op:"); } - ACE_ENDTRY; } void -client_i::twoway_no_op (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +client_i::twoway_no_op (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, |