1 files changed, 8 insertions, 12 deletions

diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
index 106c14a0ec0..a674abae643 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
@@ -12,38 +12,34 @@ Oneway_Receiver::Oneway_Receiver (CORBA::ORB_ptr orb)
 }
 
 void
-Oneway_Receiver::raise_no_permission (ACE_ENV_SINGLE_ARG_DECL)
+Oneway_Receiver::raise_no_permission (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_PERMISSION ());
+  throw CORBA::NO_PERMISSION ();
 }
 
 void
-Oneway_Receiver::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Oneway_Receiver::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var poa = this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 }
 
 Test::Shutdown_Helper_ptr
-Oneway_Receiver::get_shutdown_helper (ACE_ENV_SINGLE_ARG_DECL)
+Oneway_Receiver::get_shutdown_helper (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Shutdown_Helper *shutdown_helper;
   ACE_NEW_THROW_EX (shutdown_helper,
                     Shutdown_Helper (this->orb_.in ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Test::Shutdown_Helper::_nil ());
 
   PortableServer::ServantBase_var transfer_ownership(shutdown_helper);
 
-  return shutdown_helper->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return shutdown_helper->_this ();
 }