diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
commit | c801f87e59c00f72bdeb5ce7bd0d276674665bac (patch) | |
tree | 70bff03d1cf156ecf05ee4c5c338d8ce423e64ee /TAO/tests/Nested_Event_Loop/test_i.cpp | |
parent | 98c0b37d4714ff774fc3ada8c9ee893c719af714 (diff) | |
download | ATCD-c801f87e59c00f72bdeb5ce7bd0d276674665bac.tar.gz |
Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests/Nested_Event_Loop/test_i.cpp')
-rw-r--r-- | TAO/tests/Nested_Event_Loop/test_i.cpp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp index 7b27990c225..c05f95b0850 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.cpp +++ b/TAO/tests/Nested_Event_Loop/test_i.cpp @@ -25,20 +25,17 @@ server_i::loop (client_ptr remote_partner, this->run_no_ops (remote_partner, event_loop_iterations / 2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (--event_loop_depth != 0) { remote_partner->loop (event_loop_depth, event_loop_iterations ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } this->run_no_ops (remote_partner, event_loop_iterations / 2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -74,12 +71,10 @@ server_i::run_no_ops (client_ptr remote_partner, remote_partner->oneway_no_op (act_for_iterations, act_for_flag ACE_ENV_ARG_PARAMETER); - ACE_CHECK; while (!got_reply) { - this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_->perform_work (); } } } @@ -111,12 +106,11 @@ 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 @@ -144,14 +138,12 @@ client_i::loop (CORBA::ULong event_loop_depth, ACE_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; } ACE_CATCHANY { @@ -172,14 +164,12 @@ client_i::oneway_no_op (const act &act_for_iterations, ACE_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; } ACE_CATCHANY { @@ -190,7 +180,7 @@ client_i::oneway_no_op (const act &act_for_iterations, } 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, |