1 files changed, 16 insertions, 31 deletions

diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
index 0fc2e22471a..d59859dabcc 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
@@ -15,13 +15,12 @@ Foo_C_Custom_Proxy::Foo_C_Custom_Proxy(Foo_C_i* servant,
     objref_(Foo_C::_duplicate(objref)),
     strategy_(strategy, false)
 {
-  // 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
   {
@@ -32,13 +31,12 @@ Foo_C_Custom_Proxy::Foo_C_Custom_Proxy(Foo_C_i* servant,
 
 Foo_C_Custom_Proxy::~Foo_C_Custom_Proxy()
 {
-  // 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
   {
@@ -55,10 +53,9 @@ Foo_C_Custom_Proxy::validate_connection ()
 
 
 void
-Foo_C_Custom_Proxy::op1(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_Custom_Proxy::op1(void)
 {
-  this->objref_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->objref_->op1();
 }
 
 
@@ -66,7 +63,6 @@ void
 Foo_C_Custom_Proxy::op2(CORBA::Long x ACE_ENV_ARG_DECL)
 {
   this->objref_->op2(x ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 
@@ -74,7 +70,6 @@ CORBA::Long
 Foo_C_Custom_Proxy::op3(CORBA::Long x ACE_ENV_ARG_DECL)
 {
   CORBA::Long result = this->objref_->op3(x ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
   return result;
 }
 
@@ -83,32 +78,28 @@ void
 Foo_C_Custom_Proxy::op4(CORBA::Long x ACE_ENV_ARG_DECL)
 {
   this->objref_->op4(x ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 
 void
-Foo_C_Custom_Proxy::op5(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_Custom_Proxy::op5(void)
 {
-  this->objref_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->objref_->op5();
 }
 
 
 void
-Foo_C_Custom_Proxy::done(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_Custom_Proxy::done(void)
 {
-  this->objref_->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->objref_->done();
 }
 
 
 void
-Foo_C_Custom_Proxy::cust_op1(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_Custom_Proxy::cust_op1(void)
 {
   Foo_C_cust_op1_Handle op = new Foo_C_cust_op1(this->servant_);
   this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 
@@ -117,7 +108,6 @@ Foo_C_Custom_Proxy::cust_op2(long x ACE_ENV_ARG_DECL)
 {
   Foo_C_cust_op2_Handle op = new Foo_C_cust_op2(this->servant_, x);
   this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 
@@ -126,9 +116,7 @@ Foo_C_Custom_Proxy::cust_op3(long x ACE_ENV_ARG_DECL)
 {
   Foo_C_cust_op3_Handle op = new Foo_C_cust_op3(this->servant_, x);
   this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  int ret = op->result(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  int ret = op->result();
   return ret;
 }
 
@@ -138,16 +126,13 @@ Foo_C_Custom_Proxy::cust_op4(long x ACE_ENV_ARG_DECL)
 {
   Foo_C_cust_op4_Handle op = new Foo_C_cust_op4(this->servant_,x);
   this->strategy_->custom_asynch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 
 void
-Foo_C_Custom_Proxy::cust_op5(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_Custom_Proxy::cust_op5(void)
 {
   Foo_C_cust_op5_Handle op = new Foo_C_cust_op5(this->servant_);
   this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  op->result(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  op->result();
 }