1 files changed, 10 insertions, 12 deletions

diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index 8750ae59899..dc7f9f97136 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -14,15 +14,15 @@
 ACE_RCSID(BiDirectional, 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 (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -34,7 +34,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_NOT_USED )
+ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
@@ -47,7 +47,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
@@ -55,7 +55,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
 }
 
 int
-Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::call_client (void)
 {
   if (this->flag_)
     {
@@ -63,8 +63,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
 
       for (int times = 0; 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)
             {
@@ -75,8 +74,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
             }
         }
 
-      this->callback_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->callback_->shutdown ();
       this->flag_ = 0;
 
       return 1;
@@ -87,8 +85,8 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
 
 
 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);
 }