1 files changed, 8 insertions, 15 deletions
diff --git a/TAO/examples/POA/Forwarding/test_i.cpp b/TAO/examples/POA/Forwarding/test_i.cpp
index 254c4377ace..e5b253f86ab 100644
--- a/TAO/examples/POA/Forwarding/test_i.cpp
+++ b/TAO/examples/POA/Forwarding/test_i.cpp
@@ -18,42 +18,35 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 CORBA::Long
-test_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::doit (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_++;
 }
 
 void
-test_i::forward (ACE_ENV_SINGLE_ARG_DECL)
+test_i::forward (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    test::Cannot_Forward))
 {
-  this->activator_.forward_requests (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->activator_.forward_requests ();
 
   PortableServer::ObjectId_var id =
-    this->poa_->servant_to_id (this
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->servant_to_id (this);
 
-  this->poa_->deactivate_object (id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_->deactivate_object (id.in ());
 }
 
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }