diff options
Diffstat (limited to 'TAO/tests/Big_Twoways/Coordinator.cpp')
| -rw-r--r-- | TAO/tests/Big_Twoways/Coordinator.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp index 6b6b332a9cc..1cad2f4c83d 100644 --- a/TAO/tests/Big_Twoways/Coordinator.cpp +++ b/TAO/tests/Big_Twoways/Coordinator.cpp @@ -29,8 +29,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control, CORBA::ULong payload_size, CORBA::ULong thread_count, CORBA::ULong message_count, - Test::Session_List &session_list - ACE_ENV_ARG_DECL) + Test::Session_List &session_list) { session_list.length (this->peer_count_); CORBA::ULong count = 0; @@ -43,36 +42,30 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control, payload_size, thread_count, message_count, - this->peer_count_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->peer_count_); } } void -Coordinator::shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL) +Coordinator::shutdown_all_peers (void) { for (Test::Peer_var *i = this->peers_; i != this->peers_ + this->peer_count_; ++i) { - ACE_TRY + try { - (*i)->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (*i)->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Coordinator::shutdown, ignored"); + ex._tao_print_exception ("Coordinator::shutdown, ignored"); } - ACE_ENDTRY; } } void -Coordinator::add_peer (Test::Peer_ptr peer - ACE_ENV_ARG_DECL_NOT_USED) +Coordinator::add_peer (Test::Peer_ptr peer) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->peer_count_ >= this->peer_max_) |