summaryrefslogtreecommitdiff
path: root/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp')
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
index b6bfad9dc67..ab73409239f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
@@ -11,13 +11,12 @@ Foo_C_cust_op3::Foo_C_cust_op3(Foo_C_i* servant, long arg)
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_op3::Foo_C_cust_op3(Foo_C_i* servant, long arg)
Foo_C_cust_op3::~Foo_C_cust_op3()
{
- // 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_op3::~Foo_C_cust_op3()
long
-Foo_C_cust_op3::result(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_cust_op3::result(void)
{
if (this->cancelled_)
{