diff options
Diffstat (limited to 'TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp')
| -rw-r--r-- | TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp index 6f5b6756dda..02bd2c69714 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp @@ -11,13 +11,12 @@ Foo_C_cust_op5::Foo_C_cust_op5(Foo_C_i* servant) cancelled_(false), servant_(servant) { - // This try-catch block is not really necessary, but we have to add it to - // satisfy the non-exception builds. Since there is actually no exception + // This try-catch block is not really necessary, but we have to add it to + // satisfy the non-exception builds. Since there is actually no exception // raised from _add_ref, we just ignore the exception here. ACE_TRY_NEW_ENV { - servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant_->_add_ref (); } ACE_CATCHALL { @@ -28,13 +27,12 @@ Foo_C_cust_op5::Foo_C_cust_op5(Foo_C_i* servant) Foo_C_cust_op5::~Foo_C_cust_op5() { - // This try-catch block is not really necessary, but we have to add it to - // satisfy the non-exception builds. Since there is actually no exception + // This try-catch block is not really necessary, but we have to add it to + // satisfy the non-exception builds. Since there is actually no exception // raised from _add_ref, we just ignore the exception here. ACE_TRY_NEW_ENV { - servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant_->_remove_ref (); } ACE_CATCHALL { @@ -44,7 +42,7 @@ Foo_C_cust_op5::~Foo_C_cust_op5() void -Foo_C_cust_op5::result(ACE_ENV_SINGLE_ARG_DECL) +Foo_C_cust_op5::result(void) { if (this->cancelled_) { @@ -63,8 +61,7 @@ Foo_C_cust_op5::execute_i() { ACE_TRY_NEW_ENV { - this->servant_->cust_op5(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->servant_->cust_op5(); } ACE_CATCH (CustomException, ex) { |