Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

20 files changed, 90 insertions, 209 deletions

diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
index fca62b6fe50..d55a7d9e5c2 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
@@ -26,11 +26,9 @@ Client_Task::svc (void)
 
       CORBA::Object_var object =
         corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_Interceptors::Visual_var server =
         Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -41,10 +39,8 @@ Client_Task::svc (void)
         }
 
       run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
   ACE_CATCHANY
     {
@@ -64,29 +60,25 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server
           ACE_ENV_ARG_DECL)
 {
   server->normal (10 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Long one = 1, two = 1;
   (void) server->calculate (one,
                             two
                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   ACE_TRY
     {
-      (void) server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      (void) server->user ();
     }
   ACE_CATCH (Test_Interceptors::Silly, userex)
     {
       ACE_DEBUG ((LM_DEBUG, "As expected, Caught Silly\n"));
     }
   ACE_ENDTRY;
-  ACE_CHECK;
 
   ACE_TRY_EX (SYS)
     {
-      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
+      server->system ();
       ACE_TRY_CHECK_EX (SYS);
     }
   ACE_CATCH (CORBA::INV_OBJREF, sysex)
@@ -94,5 +86,4 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server
       ACE_DEBUG ((LM_DEBUG, "As expected, Caught CORBA::INV_OBJREF\n"));
     }
   ACE_ENDTRY;
-  ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
index 41d8c39fec7..fd0619dcc12 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
@@ -134,7 +134,6 @@ main (int argc, char *argv[])
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
@@ -142,7 +141,6 @@ main (int argc, char *argv[])
                          satc.get_TCHAR_argv (),
                          server_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_Manual_Event me;
       Server_Task server_task (output,
@@ -166,7 +164,6 @@ main (int argc, char *argv[])
                          catc.get_TCHAR_argv (),
                          client_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Client_Task client_task (input,
                                corb.in (),
@@ -181,8 +178,7 @@ main (int argc, char *argv[])
 
       ACE_Thread_Manager::instance ()->wait ();
 
-      sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sorb->destroy ();
 
       bool failed_check = false;
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
index b9773fde351..d6923f750d4 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
@@ -31,32 +31,27 @@ Echo_Collocated_ORBInitializer::post_init (
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var orb_id =
-    info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    info->orb_id ();
 
   // TAO-Specific way to get to the ORB Core (and thus, the ORB).
   TAO_ORBInitInfo_var tao_info =
     TAO_ORBInitInfo::_narrow (info
                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb());
 
   if (CORBA::is_nil(orb.in()))
     {
       ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
     }
 
   PortableInterceptor::ORBInitInfo_3_1_var info_3_1 =
     PortableInterceptor::ORBInitInfo_3_1::_narrow(info
                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   if (CORBA::is_nil(info_3_1.in()))
     {
       ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
     }
 
   if (!ACE_OS::strcmp (orb_id.in (), "client_orb"))
@@ -68,7 +63,6 @@ Echo_Collocated_ORBInitializer::post_init (
       ACE_NEW_THROW_EX (interceptor,
                         Echo_Client_Request_Interceptor,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       PortableInterceptor::ClientRequestInterceptor_var
         client_interceptor = interceptor;
@@ -83,16 +77,13 @@ Echo_Collocated_ORBInitializer::post_init (
         orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE,
                             client_proc_mode_as_any
                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       info_3_1->add_client_request_interceptor_with_policy (
                                         client_interceptor.in (),
                                         policy_list
                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
-      policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      policy_list[0]->destroy ();
       policy_list[0] = CORBA::Policy::_nil ();
     }
   else if (!ACE_OS::strcmp (orb_id.in (), "server_orb"))
@@ -104,7 +95,6 @@ Echo_Collocated_ORBInitializer::post_init (
       ACE_NEW_THROW_EX (interceptor,
                         Echo_Server_Request_Interceptor,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       PortableInterceptor::ServerRequestInterceptor_var
         server_interceptor = interceptor;
@@ -119,16 +109,13 @@ Echo_Collocated_ORBInitializer::post_init (
         orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE,
                             server_proc_mode_as_any
                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       info_3_1->add_server_request_interceptor_with_policy (
                                             server_interceptor.in (),
                                             policy_list
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
-      policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      policy_list[0]->destroy ();
       policy_list[0] = CORBA::Policy::_nil ();
     }
   else
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
index a9db6a71b8a..32cca3aa9dc 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
@@ -31,7 +31,6 @@ Server_Task::svc (void)
 
       CORBA::Object_var poa_object =
         sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -40,14 +39,11 @@ Server_Task::svc (void)
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Visual_i * server_impl = 0;
       ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1);
@@ -55,21 +51,17 @@ Server_Task::svc (void)
       PortableServer::ObjectId_var id =
         root_poa->activate_object (server_impl
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var test_obj =
         root_poa->id_to_reference (id.in ()
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_Interceptors::Visual_var server =
         Test_Interceptors::Visual::_narrow (test_obj.in ()
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ()));
 
@@ -89,13 +81,11 @@ Server_Task::svc (void)
       // Signal the main thread before we call orb->run ();
       this->me_.signal ();
 
-      this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->sorb_->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
    }
  ACE_CATCHANY
    {
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
index 2082c0d81c9..20d48b0fba4 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
@@ -28,14 +28,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 }
 
 char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -58,8 +58,7 @@ Echo_Client_Request_Interceptor::send_request (
                    PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var op =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->operation ();
 
   // Do not count the _is_a calls
   if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
@@ -78,8 +77,7 @@ Echo_Client_Request_Interceptor::send_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -100,8 +98,7 @@ Echo_Client_Request_Interceptor::receive_other (
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
   if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
@@ -121,8 +118,7 @@ Echo_Client_Request_Interceptor::receive_reply (
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
   if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
@@ -138,8 +134,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -150,8 +145,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   else if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param1, param2, result;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -159,8 +153,7 @@ Echo_Client_Request_Interceptor::receive_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
 
@@ -180,8 +173,7 @@ Echo_Client_Request_Interceptor::receive_exception (
                      PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
   if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
@@ -190,8 +182,7 @@ Echo_Client_Request_Interceptor::receive_exception (
     }
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->received_exception_id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::received_exception "
@@ -213,14 +204,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 }
 
 char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -242,8 +233,7 @@ Echo_Server_Request_Interceptor::receive_request (
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
   if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
@@ -252,8 +242,7 @@ Echo_Server_Request_Interceptor::receive_request (
     }
 
   PortableInterceptor::ObjectId_var test_oid =
-    ri->object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->object_id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n",
@@ -262,8 +251,7 @@ Echo_Server_Request_Interceptor::receive_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -277,8 +265,7 @@ Echo_Server_Request_Interceptor::receive_request (
      }
 
   CORBA::String_var tmdi =
-    ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->target_most_derived_interface ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Target most derived interface: %s\n",
@@ -292,8 +279,7 @@ Echo_Server_Request_Interceptor::send_reply (
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
   if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
@@ -308,8 +294,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -323,8 +308,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param1, param2, result = 0;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -332,8 +316,7 @@ Echo_Server_Request_Interceptor::send_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
 
@@ -353,8 +336,7 @@ Echo_Server_Request_Interceptor::send_exception (
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
   if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
@@ -369,13 +351,11 @@ Echo_Server_Request_Interceptor::send_exception (
 
 
   CORBA::Any_var any =
-    ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->sending_exception ();
 
   CORBA::TypeCode_var type = any->type ();
 
-  const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  const char *exception_id = type->id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Exception ID = %s\n",
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
index c136eb18144..652a0f4ba9d 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
@@ -32,11 +32,11 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_poll (
@@ -85,11 +85,11 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
index 31585a94528..c145b2fe700 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
@@ -30,7 +30,7 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 void
-Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::user (void)
   ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
@@ -38,7 +38,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::system (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
@@ -46,11 +46,10 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
index f31756fb10a..ab24946aa27 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
@@ -37,13 +37,13 @@ public:
                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void user (void)
     ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly));
 
-  void system (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void system (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
index 0990fd47209..a1a7b9fbb27 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
@@ -26,11 +26,9 @@ Client_Task::svc (void)
 
       CORBA::Object_var object =
         corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_Interceptors::Visual_var server =
         Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -41,10 +39,8 @@ Client_Task::svc (void)
         }
 
       run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
   ACE_CATCHANY
     {
@@ -64,29 +60,25 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server
           ACE_ENV_ARG_DECL)
 {
   server->normal (10 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Long one = 1, two = 1;
   (void) server->calculate (one,
                             two
                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   ACE_TRY
     {
-      (void) server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      (void) server->user ();
     }
   ACE_CATCH (Test_Interceptors::Silly, userex)
     {
       ACE_DEBUG ((LM_DEBUG, "As expected, Caught Silly\n"));
     }
   ACE_ENDTRY;
-  ACE_CHECK;
 
   ACE_TRY_EX (SYS)
     {
-      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
+      server->system ();
       ACE_TRY_CHECK_EX (SYS);
     }
   ACE_CATCH (CORBA::INV_OBJREF, sysex)
@@ -94,5 +86,4 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server
       ACE_DEBUG ((LM_DEBUG, "As expected, Caught CORBA::INV_OBJREF\n"));
     }
   ACE_ENDTRY;
-  ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
index 15751d6f087..4f1ff3e4708 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
@@ -32,25 +32,21 @@ Echo_Client_ORBInitializer::post_init (
   TAO_ORBInitInfo_var tao_info =
     TAO_ORBInitInfo::_narrow (info
                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb());
 
   if (CORBA::is_nil(orb.in()))
     {
       ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
     }
 
   PortableInterceptor::ORBInitInfo_3_1_var info_3_1 =
     PortableInterceptor::ORBInitInfo_3_1::_narrow(info
                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   if (CORBA::is_nil(info_3_1.in()))
     {
       ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
     }
 
   PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
@@ -60,7 +56,6 @@ Echo_Client_ORBInitializer::post_init (
   ACE_NEW_THROW_EX (interceptor,
                     Echo_Client_Request_Interceptor,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_var
     client_interceptor = interceptor;
@@ -75,16 +70,13 @@ Echo_Client_ORBInitializer::post_init (
     orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE,
                         client_proc_mode_as_any
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   info_3_1->add_client_request_interceptor_with_policy (
                                     client_interceptor.in (),
                                     policy_list
                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
-  policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  policy_list[0]->destroy ();
   policy_list[0] = CORBA::Policy::_nil ();
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
index 9136e25e126..bb17b9dcbc4 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
@@ -29,32 +29,27 @@ Echo_Server_ORBInitializer::post_init (
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var orb_id =
-    info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    info->orb_id ();
 
   // TAO-Specific way to get to the ORB Core (and thus, the ORB).
   TAO_ORBInitInfo_var tao_info =
     TAO_ORBInitInfo::_narrow (info
                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb());
 
   if (CORBA::is_nil(orb.in()))
     {
       ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
     }
 
   PortableInterceptor::ORBInitInfo_3_1_var info_3_1 =
     PortableInterceptor::ORBInitInfo_3_1::_narrow(info
                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   if (CORBA::is_nil(info_3_1.in()))
     {
       ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
     }
 
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor =
@@ -64,7 +59,6 @@ Echo_Server_ORBInitializer::post_init (
   ACE_NEW_THROW_EX (interceptor,
                     Echo_Server_Request_Interceptor,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = interceptor;
@@ -79,16 +73,13 @@ Echo_Server_ORBInitializer::post_init (
     orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE,
                         proc_mode_as_any
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   info_3_1->add_server_request_interceptor_with_policy (
                                         server_interceptor.in (),
                                         policy_list
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
-  policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  policy_list[0]->destroy ();
   policy_list[0] = CORBA::Policy::_nil ();
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
index 7fbab820892..f33f57fbb52 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
@@ -31,7 +31,6 @@ Server_Task::svc (void)
 
       CORBA::Object_var poa_object =
         sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -40,14 +39,11 @@ Server_Task::svc (void)
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Visual_i * server_impl = 0;
       ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1);
@@ -55,21 +51,17 @@ Server_Task::svc (void)
       PortableServer::ObjectId_var id =
         root_poa->activate_object (server_impl
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var test_obj =
         root_poa->id_to_reference (id.in ()
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_Interceptors::Visual_var server =
         Test_Interceptors::Visual::_narrow (test_obj.in ()
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ()));
 
@@ -89,16 +81,13 @@ Server_Task::svc (void)
       // Signal the main thread before we call orb->run ();
       this->me_.signal ();
 
-      this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->sorb_->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->sorb_->destroy ();
    }
  ACE_CATCHANY
    {
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
index 399025fa883..2fe59bcd88a 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
@@ -25,14 +25,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 }
 
 char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -57,8 +57,7 @@ Echo_Client_Request_Interceptor::send_request (
   client_interceptor_check_++;
 
   CORBA::String_var op =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::send_request\n"));
@@ -71,8 +70,7 @@ Echo_Client_Request_Interceptor::send_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -94,8 +92,7 @@ Echo_Client_Request_Interceptor::receive_other (
 {
   client_interceptor_check_++;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::receive_other "
@@ -111,8 +108,7 @@ Echo_Client_Request_Interceptor::receive_reply (
 {
   client_interceptor_check_++;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::receive_reply "
@@ -122,8 +118,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -134,8 +129,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   else if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param1, param2, result;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -143,8 +137,7 @@ Echo_Client_Request_Interceptor::receive_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
 
@@ -165,12 +158,10 @@ Echo_Client_Request_Interceptor::receive_exception (
 {
   client_interceptor_check_++;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->received_exception_id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::received_exception "
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
index fc49396097a..fed9edd4a14 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
@@ -31,11 +31,11 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_poll (
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
index 78a62bdf25e..52b80caf5d9 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
@@ -90,7 +90,6 @@ main (int argc, char *argv[])
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_Argv_Type_Converter atc (argc, argv);
       CORBA::ORB_var orb =
@@ -98,7 +97,6 @@ main (int argc, char *argv[])
                          atc.get_TCHAR_argv (),
                          ""
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Client_Task client_task (input,
                                orb.in (),
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
index 9889379c63d..99dfbe20c3c 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
@@ -25,14 +25,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 }
 
 char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -55,12 +55,10 @@ Echo_Server_Request_Interceptor::receive_request (
 {
   ++server_interceptor_check_;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   PortableInterceptor::ObjectId_var test_oid =
-    ri->object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->object_id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n",
@@ -69,8 +67,7 @@ Echo_Server_Request_Interceptor::receive_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -84,8 +81,7 @@ Echo_Server_Request_Interceptor::receive_request (
      }
 
   CORBA::String_var tmdi =
-    ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->target_most_derived_interface ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Target most derived interface: %s\n",
@@ -100,8 +96,7 @@ Echo_Server_Request_Interceptor::send_reply (
 {
   ++server_interceptor_check_;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n",
@@ -110,8 +105,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -125,8 +119,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param1, param2, result = 0;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -134,8 +127,7 @@ Echo_Server_Request_Interceptor::send_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
 
@@ -154,8 +146,7 @@ Echo_Server_Request_Interceptor::send_exception (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::send_exception "
@@ -164,8 +155,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
 
   CORBA::Any_var any =
-    ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->sending_exception ();
 
   CORBA::TypeCode_var type = any->type ();
   if (0 == type.in())
@@ -178,8 +168,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
   ++server_interceptor_check_;
 
-  const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  const char *exception_id = type->id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Exception ID = %s\n",
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
index 1c6f50936a3..ebdc7d817d8 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
@@ -31,11 +31,11 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
index 720d51ab9ad..43308b6cdfe 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
@@ -90,7 +90,6 @@ main (int argc, char *argv[])
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_Argv_Type_Converter atc (argc, argv);
       CORBA::ORB_var orb =
@@ -98,7 +97,6 @@ main (int argc, char *argv[])
                          atc.get_TCHAR_argv (),
                          ""
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_Manual_Event me;
       Server_Task server_task (output,
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
index bf5fe31c9f8..066a8eee6b3 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
@@ -29,7 +29,7 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 void
-Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::user (void)
   ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
@@ -37,7 +37,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::system (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
@@ -45,11 +45,10 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
index f31756fb10a..ab24946aa27 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
@@ -37,13 +37,13 @@ public:
                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void user (void)
     ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly));
 
-  void system (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void system (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private: