diff options
Diffstat (limited to 'TAO/tests/BiDirectional_NestedUpcall/test_i.cpp')
| -rw-r--r-- | TAO/tests/BiDirectional_NestedUpcall/test_i.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp index 6544ddbfbda..2b3eb2fd280 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp @@ -13,15 +13,15 @@ ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$") void -Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Callback_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } void -Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Callback_i::callback_method ( /**/) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -32,8 +32,7 @@ Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_A // **************************************************************** CORBA::Long -Simple_Server_i::test_method (CORBA::Boolean do_callback - ACE_ENV_ARG_DECL) +Simple_Server_i::test_method (CORBA::Boolean do_callback) ACE_THROW_SPEC ((CORBA::SystemException)) { if (do_callback) @@ -46,8 +45,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback times < this->no_iterations_; ++times) { - this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->callback_->callback_method (); if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1) { @@ -64,7 +62,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback void Simple_Server_i::callback_object (Callback_ptr callback - ACE_ENV_ARG_DECL_NOT_USED ) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Store the callback object @@ -73,8 +71,8 @@ Simple_Server_i::callback_object (Callback_ptr callback void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } |