1 files changed, 6 insertions, 9 deletions
diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp
index 6150714b0a5..7271b79e988 100644
--- a/TAO/tests/Object_Loader/Test_i.cpp
+++ b/TAO/tests/Object_Loader/Test_i.cpp
@@ -14,28 +14,25 @@ Test_i::Test_i (PortableServer::POA_ptr poa)
 }
 
 CORBA::Long
-Test_i::instance_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_i::instance_count (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Test_i::instance_count_;
 }
 
 void
-Test_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
+  poa->deactivate_object (oid.in ());
 }
 
 PortableServer::POA_ptr
-Test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_i::_default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());