1 files changed, 12 insertions, 16 deletions
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
index c0bc62fb2f0..40ffbf190f9 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
@@ -10,44 +10,40 @@ Foo_C_cust_op2::Foo_C_cust_op2(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
+  try
   {
-    servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    servant_->_add_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
 Foo_C_cust_op2::~Foo_C_cust_op2()
 {
-  // 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
+  try
   {
-    servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    servant_->_remove_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
 void
-Foo_C_cust_op2::result(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_cust_op2::result(void)
 {
   if (this->cancelled_)
     {
-      ACE_THROW (CancelledException());
+      throw CancelledException();
     }
 }