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

14 files changed, 168 insertions, 229 deletions

diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp
index abc2da4613c..46f8afebce5 100644
--- a/TAO/tao/PI_Server/PI_Server_Loader.cpp
+++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp
@@ -38,8 +38,7 @@ TAO_PI_Server_Loader::init (int,
   initialized = true;
 
   // Register the ORB initializer.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       /// Register the Messaging ORBInitializer.
       PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
@@ -52,23 +51,19 @@ TAO_PI_Server_Loader::init (int,
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_orb_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                    );
     }
-  ACE_CATCHANY
+  catch ( ::CORBA::Exception& ex)
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tao/PI_Server/Policy_Creator_T.h b/TAO/tao/PI_Server/Policy_Creator_T.h
index 6b4784fb607..0a38c59d9e4 100644
--- a/TAO/tao/PI_Server/Policy_Creator_T.h
+++ b/TAO/tao/PI_Server/Policy_Creator_T.h
@@ -32,7 +32,7 @@ namespace TAO
         POLICYTYPE *& policy,
         POLICYVALUE &value,
         const CORBA::Any& val
-        ACE_ENV_ARG_DECL)
+        )
     {
       if ((val >>= value) == 0)
         ACE_THROW (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE));
@@ -41,7 +41,6 @@ namespace TAO
                         POLICYTYPE (value),
                         CORBA::NO_MEMORY (TAO::VMCID,
                                           CORBA::COMPLETED_NO));
-      ACE_CHECK;
     }
   }
 }
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
index 301ea9d90b5..795a3b3f768 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
@@ -17,27 +17,23 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_PortableServer_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_PortableServer_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  );
 }
 
 void
 TAO_PortableServer_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
 {
 #if !defined (CORBA_E_MICRO)
   // Register the PortableServer policy factories.
@@ -49,7 +45,6 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::PolicyFactory_var policy_factory = tmp;
 
@@ -75,14 +70,13 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
        i != end;
        ++i)
     {
-      ACE_TRY
+      try
         {
           info->register_policy_factory (*i,
                                          policy_factory.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                        );
         }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+      catch ( ::CORBA::BAD_INV_ORDER& ex)
         {
           if (ex.minor () == (CORBA::OMGVMCID | 16))
             {
@@ -93,15 +87,13 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
               // ORBInitializer.
               return;
             }
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_CATCHANY
+      catch ( ::CORBA::Exception&)
         {
           // Rethrow any other exceptions...
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 #else
   ACE_UNUSED_ARG (info);
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
index 8aba0600ea2..0227fa0d23b 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
@@ -42,11 +42,11 @@ public:
   //@{
 
   void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                 ACE_ENV_ARG_DECL)
+                 )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                  ACE_ENV_ARG_DECL)
+                  )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
@@ -55,7 +55,7 @@ private:
 
   /// Register PortableServer policy factories.
   void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info
-                                  ACE_ENV_ARG_DECL);
+                                 );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
index eaa42cf7ff5..7b337421ed3 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
@@ -21,7 +21,7 @@ CORBA::Policy_ptr
 TAO_PortableServer_PolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
@@ -33,8 +33,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       TAO::Portable_Server::ThreadPolicy *thread_policy = 0;
       PortableServer::ThreadPolicyValue thr_value;
 
-      TAO::Portable_Server::create_policy (thread_policy, thr_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      TAO::Portable_Server::create_policy (thread_policy, thr_value, value);
 
       return thread_policy;
     }
@@ -45,8 +44,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       TAO::Portable_Server::LifespanPolicy *lifespan_policy = 0;
       PortableServer::LifespanPolicyValue lifespan_value;
 
-      TAO::Portable_Server::create_policy (lifespan_policy, lifespan_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      TAO::Portable_Server::create_policy (lifespan_policy, lifespan_value, value);
 
       return lifespan_policy;
     }
@@ -56,8 +54,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       TAO::Portable_Server::IdUniquenessPolicy *id_uniqueness_policy = 0;
       PortableServer::IdUniquenessPolicyValue id_uniqueness_value;
 
-      TAO::Portable_Server::create_policy (id_uniqueness_policy, id_uniqueness_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      TAO::Portable_Server::create_policy (id_uniqueness_policy, id_uniqueness_value, value);
 
       return id_uniqueness_policy;
     }
@@ -67,8 +64,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       TAO::Portable_Server::IdAssignmentPolicy *id_assignment_policy = 0;
       PortableServer::IdAssignmentPolicyValue id_assignment_value;
 
-      TAO::Portable_Server::create_policy (id_assignment_policy, id_assignment_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      TAO::Portable_Server::create_policy (id_assignment_policy, id_assignment_value, value);
 
       return id_assignment_policy;
     }
@@ -80,8 +76,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       TAO::Portable_Server::ImplicitActivationPolicy *implicit_activatation_policy = 0;
       PortableServer::ImplicitActivationPolicyValue implicit_activation_value;
 
-      TAO::Portable_Server::create_policy (implicit_activatation_policy, implicit_activation_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      TAO::Portable_Server::create_policy (implicit_activatation_policy, implicit_activation_value, value);
 
       return implicit_activatation_policy;
     }
@@ -91,8 +86,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       TAO::Portable_Server::ServantRetentionPolicy *servant_retention_policy = 0;
       PortableServer::ServantRetentionPolicyValue servant_retention_value;
 
-      TAO::Portable_Server::create_policy (servant_retention_policy, servant_retention_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      TAO::Portable_Server::create_policy (servant_retention_policy, servant_retention_value, value);
 
       return servant_retention_policy;
     }
@@ -102,8 +96,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       TAO::Portable_Server::RequestProcessingPolicy *request_processing_policy = 0;
       PortableServer::RequestProcessingPolicyValue request_processing_value;
 
-      TAO::Portable_Server::create_policy (request_processing_policy, request_processing_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      TAO::Portable_Server::create_policy (request_processing_policy, request_processing_value, value);
 
       return request_processing_policy;
     }
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
index 1a0c06ff21a..f6c07dfca62 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
@@ -33,7 +33,7 @@ class TAO_PortableServer_PolicyFactory
 public:
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                    const CORBA::Any & value
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index 7a7714e00c7..eb4e2ef455f 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -34,12 +34,12 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions,
   CORBA::OctetSeq_out oc
-  ACE_ENV_ARG_DECL)
+  )
 {
   // This method implements one of the "starting" server side
   // interception point.
 
-  ACE_TRY
+  try
     {
       oc = 0;
 
@@ -61,8 +61,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
               registered.interceptor_->
                 tao_ft_interception_point (&request_info,
                                            oc
-                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                          );
             }
 
           if (oc != 0)
@@ -73,8 +72,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
                                        servant_upcall,
                                        exceptions,
                                        nexceptions
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                      );
 
               return;
             }
@@ -84,7 +82,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
           ++server_request.interceptor_count ();
         }
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+  catch ( ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -94,11 +92,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
                                servant_upcall,
                                exceptions,
                                nexceptions
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              );
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
@@ -109,7 +104,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions
-  ACE_ENV_ARG_DECL)
+  )
 {
   // This method implements one of the "intermediate" server side
   // interception point.
@@ -124,10 +119,10 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
       // evaluates to "true," then it is likely that a starting
       // interception point was never invoked.  This is of course, an
       // internal error that must be corrected.
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ( ::CORBA::INTERNAL ());
     }
 
-  ACE_TRY
+  try
     {
       // Copy the request scope current (RSC) to the thread scope
       // current (TSC) upon leaving this scope, i.e. just after the
@@ -153,12 +148,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
             {
               registered.interceptor_->
                 receive_request_service_contexts (&request_info
-                                                  ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                 );
             }
         }
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+  catch ( ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -168,11 +162,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
                                servant_upcall,
                                exceptions,
                                nexceptions
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              );
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 #elif TAO_HAS_EXTENDED_FT_INTERCEPTORS == 0
@@ -188,12 +179,12 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions
-  ACE_ENV_ARG_DECL)
+  )
 {
   // This method implements one of the "starting" server side
   // interception point if extended interceptors are not in place.
 
-  ACE_TRY
+  try
     {
       // Copy the request scope current (RSC) to the thread scope
       // current (TSC) upon leaving this scope, i.e. just after the
@@ -220,8 +211,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
             {
               registered.interceptor_->
                 receive_request_service_contexts (&request_info
-                                                  ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                 );
             }
 
           // The starting interception point completed successfully.
@@ -229,7 +219,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
           ++server_request.interceptor_count ();
         }
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+  catch ( ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -239,11 +229,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
                                servant_upcall,
                                exceptions,
                                nexceptions
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              );
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
@@ -256,7 +243,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions
-  ACE_ENV_ARG_DECL)
+  )
 {
   // This method implements an "intermediate" server side interception
   // point.  Interceptors are invoked in the same order they were
@@ -272,7 +259,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
       // evaluates to "true," then it is likely that a starting
       // interception point was never invoked.  This is of course, an
       // internal error that must be corrected.
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ( ::CORBA::INTERNAL ());
     }
 
   TAO::ServerRequestInfo request_info (server_request,
@@ -282,7 +269,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
                                        exceptions,
                                        nexceptions);
 
-  ACE_TRY
+  try
     {
       bool is_remote_request = !server_request.collocated ();
 
@@ -295,8 +282,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
             {
               registered.interceptor_->
                 receive_request (&request_info
-                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                );
             }
 
           // Note that no interceptors are pushed on to or popped off
@@ -304,7 +290,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
           // an intermediate interception point.
         }
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+  catch ( ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -314,11 +300,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
                         servant_upcall,
                         exceptions,
                         nexceptions
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       );
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
 }
 
@@ -330,7 +313,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply (
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions
-  ACE_ENV_ARG_DECL)
+  )
 {
   // This is an "ending" interception point so we only process the
   // interceptors pushed on to the flow stack.
@@ -366,8 +349,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply (
         {
           registered.interceptor_->
             send_reply (&request_info
-                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                       );
         }
     }
 
@@ -384,7 +366,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions
-  ACE_ENV_ARG_DECL)
+  )
 {
   // This is an "ending" server side interception point so we only
   // process the interceptors pushed on to the flow stack.
@@ -402,7 +384,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
                                        exceptions,
                                        nexceptions);
 
-  ACE_TRY
+  try
     {
       // Unwind the flow stack.
       size_t const len = server_request.interceptor_count ();
@@ -422,12 +404,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
             {
               registered.interceptor_->
                 send_exception (&request_info
-                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                               );
             }
         }
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+  catch ( ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -437,10 +418,9 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
                         servant_upcall,
                         exceptions,
                         nexceptions
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       );
     }
-  ACE_CATCHANY
+  catch ( ::CORBA::Exception& ex)
     {
       // The send_exception() interception point in the remaining
       // interceptors must be called so call this method (not the
@@ -460,8 +440,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
                             servant_upcall,
                             exceptions,
                             nexceptions
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           );
 
       PortableInterceptor::ReplyStatus status =
         server_request.reply_status ();
@@ -471,10 +450,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
       // LOCATION_FORWARD).
       if (status == PortableInterceptor::SYSTEM_EXCEPTION
           || status == PortableInterceptor::USER_EXCEPTION)
-        ACE_RE_THROW;
+        throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
@@ -485,7 +462,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions
-  ACE_ENV_ARG_DECL)
+  )
 {
   // This is an "ending" server side interception point so we only
   // process the interceptors pushed on to the flow stack.
@@ -503,7 +480,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
   // they were pushed onto the stack since this is an "ending" server
   // side interception point.
 
-  ACE_TRY
+  try
     {
       // Unwind the flow stack.
       size_t const len = server_request.interceptor_count ();
@@ -523,12 +500,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
             {
               registered.interceptor_->
                 send_other (&request_info
-                            ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                           );
             }
         }
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+  catch ( ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -538,37 +514,34 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
                         servant_upcall,
                         exceptions,
                         nexceptions
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       );
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor (
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-  ACE_ENV_ARG_DECL)
+  )
 {
-  this->interceptor_list_.add_interceptor (interceptor ACE_ENV_ARG_PARAMETER);
+  this->interceptor_list_.add_interceptor (interceptor);
 }
 
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor (
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
   const CORBA::PolicyList& policies
-  ACE_ENV_ARG_DECL)
+  )
 {
   this->interceptor_list_.add_interceptor (interceptor,
                                            policies
-                                           ACE_ENV_ARG_PARAMETER);
+                                          );
 }
 
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (
-  ACE_ENV_SINGLE_ARG_DECL)
+  void)
 {
-  this->interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->interceptor_list_.destroy_interceptors ();
 }
 
 TAO::PICurrent_Impl *
@@ -592,14 +565,13 @@ void
 TAO::ServerRequestInterceptor_Adapter_Impl::execute_command (
   TAO_ServerRequest & server_request,
   TAO::Upcall_Command & command
-  ACE_ENV_ARG_DECL)
+  )
 {
   TAO::PICurrent_Guard const pi_guard (server_request,
                                        true  /* Copy TSC to RSC */);
 
   // The actual upcall.
-  command.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  command.execute ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
index cd2930965f1..d9d403925c7 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
@@ -93,7 +93,7 @@ namespace TAO
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions,
         CORBA::OctetSeq_out oc
-        ACE_ENV_ARG_DECL);
+       );
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
 
     /// This method implements the "intermediate" server side
@@ -110,7 +110,7 @@ namespace TAO
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL);
+       );
 
     /// This method an "intermediate" server side interception point.
     void receive_request (
@@ -120,7 +120,7 @@ namespace TAO
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL);
+       );
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -131,7 +131,7 @@ namespace TAO
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL);
+       );
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -142,7 +142,7 @@ namespace TAO
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL);
+       );
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -153,20 +153,20 @@ namespace TAO
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL);
+       );
     //@}
 
     /// Register an interceptor.
     virtual void add_interceptor (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL);
+     );
 
     virtual void add_interceptor (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies
-      ACE_ENV_ARG_DECL);
+     );
 
-    virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
+    virtual void destroy_interceptors (void);
 
     virtual TAO::PICurrent_Impl *allocate_pi_current (void);
 
@@ -176,7 +176,7 @@ namespace TAO
     virtual void execute_command (
         TAO_ServerRequest &server_request,
         TAO::Upcall_Command &command
-        ACE_ENV_ARG_DECL);
+       );
 
   private:
 
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.cpp b/TAO/tao/PI_Server/ServerRequestDetails.cpp
index c06a9429d1d..166da908552 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.cpp
+++ b/TAO/tao/PI_Server/ServerRequestDetails.cpp
@@ -17,7 +17,7 @@ namespace TAO
   void
   ServerRequestDetails::apply_policies (
       const CORBA::PolicyList &policies
-      ACE_ENV_ARG_DECL)
+      )
   {
     // Flag to check for duplicate ProcessingModePolicy objects in the list.
     bool processing_mode_applied = false;
@@ -36,8 +36,7 @@ namespace TAO
 
         // Obtain the PolicyType from the current Policy object.
         const CORBA::PolicyType policy_type =
-          policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          policy->policy_type ();
 
         if (policy_type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE)
           {
@@ -45,7 +44,7 @@ namespace TAO
               {
                 // This is the second time we have run into this policy type,
                 // and that is not allowed.
-                ACE_THROW (CORBA::INV_POLICY ());
+                throw ( ::CORBA::INV_POLICY ());
               }
 
             // Flip the flag to true in order to trap any dupes.
@@ -55,18 +54,16 @@ namespace TAO
             PortableInterceptor::ProcessingModePolicy_var pm_policy =
                     PortableInterceptor::ProcessingModePolicy::_narrow (
                                                  policy.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+                                                );
 
             // Save the value of the ProcessingModePolicy in our data member.
             this->processing_mode_ =
-              pm_policy->processing_mode (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
+              pm_policy->processing_mode ();
           }
         else
           {
             // We don't support the current policy type.
-            ACE_THROW (CORBA::INV_POLICY ());
+            throw ( ::CORBA::INV_POLICY ());
           }
       }
   }
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h
index fc34a6a66f5..e513b153961 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.h
+++ b/TAO/tao/PI_Server/ServerRequestDetails.h
@@ -54,7 +54,7 @@ namespace TAO
     ServerRequestDetails (void);
 
     void apply_policies (const CORBA::PolicyList& policies
-                         ACE_ENV_ARG_DECL);
+                        );
 
     /// Returns true if the ProcessingMode setting permits the "firing"
     /// of the associated server request interceptor based upon the
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp
index 65695dc5317..d686d43b5e0 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp
@@ -32,7 +32,7 @@ ACE_RCSID (PI_Server,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::ULong
-TAO::ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::ServerRequestInfo::request_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The request ID returned by this method need not correspond to the
@@ -71,14 +71,14 @@ TAO::ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-TAO::ServerRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::ServerRequestInfo::operation (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->server_request_.operation ());
 }
 
 Dynamic::ParameterList *
-TAO::ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::arguments (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->args_ == 0)
@@ -90,8 +90,7 @@ TAO::ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
 
   // Generate the argument list on demand.
   Dynamic::ParameterList * const parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    TAO_RequestInfo_Util::make_parameter_list ();
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
 
@@ -120,7 +119,7 @@ TAO::ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO::ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::exceptions (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->args_ == 0)
@@ -132,8 +131,7 @@ TAO::ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
 
   // Generate the exception list on demand.
   Dynamic::ExceptionList * const exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    TAO_RequestInfo_Util::make_exception_list ();
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
 
@@ -154,7 +152,7 @@ TAO::ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ContextList *
-TAO::ServerRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::contexts (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
@@ -163,7 +161,7 @@ TAO::ServerRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::RequestContext *
-TAO::ServerRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::operation_context (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
@@ -172,7 +170,7 @@ TAO::ServerRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any *
-TAO::ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::result (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->args_ == 0)
@@ -188,8 +186,7 @@ TAO::ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Any * result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                   );
 
   CORBA::Any_var safe_result_any = result_any;
 
@@ -202,14 +199,14 @@ TAO::ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Boolean
-TAO::ServerRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::ServerRequestInfo::response_expected (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->server_request_.response_expected ();
 }
 
 Messaging::SyncScope
-TAO::ServerRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::sync_scope (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->server_request_.sync_with_server ())
@@ -221,7 +218,7 @@ TAO::ServerRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 PortableInterceptor::ReplyStatus
-TAO::ServerRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::reply_status (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->server_request_.reply_status () == -1)
@@ -234,7 +231,7 @@ TAO::ServerRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Object_ptr
-TAO::ServerRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::forward_reference (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->server_request_.reply_status () != PortableInterceptor::LOCATION_FORWARD)
@@ -249,7 +246,7 @@ TAO::ServerRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
 
 CORBA::Any *
 TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
-                                  ACE_ENV_ARG_DECL)
+                                  )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -264,20 +261,19 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
   if (pi_current == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  pi_current->check_validity (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  pi_current->check_validity (id);
 
   // Retrieve the request scope PICurrent object.
   TAO::PICurrent_Impl *rsc = this->server_request_.rs_pi_current ();
 
-  return rsc->get_slot (id ACE_ENV_ARG_PARAMETER);
+  return rsc->get_slot (id);
 
 }
 
 IOP::ServiceContext *
 TAO::ServerRequestInfo::get_request_service_context (
     IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Service_Context &service_context_list =
@@ -285,13 +281,13 @@ TAO::ServerRequestInfo::get_request_service_context (
 
   return this->get_service_context_i (service_context_list,
                                       id
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
 }
 
 IOP::ServiceContext *
 TAO::ServerRequestInfo::get_reply_service_context (
     IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Service_Context & service_context_list =
@@ -299,14 +295,14 @@ TAO::ServerRequestInfo::get_reply_service_context (
 
   return this->get_service_context_i (service_context_list,
                                       id
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
 }
 
 IOP::ServiceContext *
 TAO::ServerRequestInfo::get_service_context_i (
     TAO_Service_Context & service_context_list,
     IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   IOP::ServiceContext_var service_context;
@@ -329,7 +325,7 @@ TAO::ServerRequestInfo::get_service_context_i (
 // exception from an Any. This method is in place just to be compliant
 // with the spec.
 CORBA::Any *
-TAO::ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::sending_exception (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->server_request_.reply_status () != PortableInterceptor::SYSTEM_EXCEPTION
@@ -353,7 +349,6 @@ TAO::ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CORBA::Any_var caught_exception_var = temp;
 
@@ -364,7 +359,7 @@ TAO::ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-TAO::ServerRequestInfo::server_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::server_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
@@ -378,7 +373,7 @@ TAO::ServerRequestInfo::server_id (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-TAO::ServerRequestInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::orb_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
@@ -391,7 +386,7 @@ TAO::ServerRequestInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 PortableInterceptor::AdapterName *
-TAO::ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::adapter_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The adapter_name attribute defines a name for the object adapter
@@ -402,7 +397,7 @@ TAO::ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
   if (this->servant_upcall_ != 0)
     return
       this->servant_upcall_->poa ().adapter_name (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
+        );
 
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
                                           CORBA::COMPLETED_NO),
@@ -410,7 +405,7 @@ TAO::ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 PortableInterceptor::ObjectId *
-TAO::ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::object_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
@@ -427,7 +422,6 @@ TAO::ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL)
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
 
       PortableInterceptor::ObjectId_var obj_id = tmp;
 
@@ -453,11 +447,11 @@ TAO::ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::OctetSeq *
-TAO::ServerRequestInfo::adapter_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::adapter_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
-    return this->servant_upcall_->poa ().id (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->servant_upcall_->poa ().id ();
 
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
                                           CORBA::COMPLETED_NO),
@@ -466,7 +460,7 @@ TAO::ServerRequestInfo::adapter_id (ACE_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO::ServerRequestInfo::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL)
+    void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::Servant const servant =
@@ -486,14 +480,13 @@ TAO::ServerRequestInfo::target_most_derived_interface (
 
 CORBA::Policy_ptr
 TAO::ServerRequestInfo::get_server_policy (CORBA::PolicyType type
-                                           ACE_ENV_ARG_DECL)
+                                           )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
     {
       CORBA::Policy_var policy =
-        this->servant_upcall_->poa ().get_policy (type ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+        this->servant_upcall_->poa ().get_policy (type);
 
       if (!CORBA::is_nil (policy.in ()))
         {
@@ -519,7 +512,7 @@ TAO::ServerRequestInfo::get_server_policy (CORBA::PolicyType type
 void
 TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
                                   const CORBA::Any &data
-                                  ACE_ENV_ARG_DECL)
+                                  )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -532,21 +525,19 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
     dynamic_cast <TAO::PICurrent*> (pi_current_obj);
 
   if (pi_current == 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw ( ::CORBA::INTERNAL ());
 
-  pi_current->check_validity (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  pi_current->check_validity (id);
 
   // Retrieve the "request scope current" (RSC).
   TAO::PICurrent_Impl * rsc = this->server_request_.rs_pi_current ();
 
-  rsc->set_slot (id, data ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  rsc->set_slot (id, data);
 }
 
 CORBA::Boolean
 TAO::ServerRequestInfo::target_is_a (const char * id
-                                     ACE_ENV_ARG_DECL)
+                                     )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Implemented in the generated skeleton.
@@ -565,14 +556,14 @@ TAO::ServerRequestInfo::target_is_a (const char * id
     }
 
   return servant->_is_a (id
-                         ACE_ENV_ARG_PARAMETER);
+                        );
 }
 
 void
 TAO::ServerRequestInfo::add_reply_service_context (
     const IOP::ServiceContext & service_context,
     CORBA::Boolean replace
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the service context from the list
@@ -581,7 +572,7 @@ TAO::ServerRequestInfo::add_reply_service_context (
 
   if (service_context_list.set_context (service_context, replace) == 0)
     {
-      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15,
+      throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15,
                                        CORBA::COMPLETED_NO));
     }
 }
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h
index 1ba2e9c0026..c19c6893f6f 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.h
+++ b/TAO/tao/PI_Server/ServerRequestInfo.h
@@ -83,49 +83,49 @@ namespace TAO
 
     /// Return an ID unique to the current request.  This request ID may
     /// or may not be the same as the GIOP request ID.
-    virtual CORBA::ULong request_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::ULong request_id (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the operation name for the current request.
-    virtual char * operation (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * operation (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the list of arguments passed to the current operation.
     virtual Dynamic::ParameterList * arguments (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the list of exceptions the current operation is capable
     /// of throwing.
     virtual Dynamic::ExceptionList * exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual Dynamic::ContextList * contexts (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual Dynamic::RequestContext * operation_context (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the result of the current request.  If there is no
     /// return value then an @c Any with @c tk_void @c TypeCode is
     /// returned.  This method is not valid for oneway operations.
     virtual CORBA::Any * result (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Returns @c true for a two-way operation, and @c false otherwise.
     virtual CORBA::Boolean response_expected (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the @c sync_scope policy value for the current one-way
     /// operation.  If the operation is not a one-way, a
     /// @c CORBA::BAD_INV_ORDER exception is thrown.
     virtual Messaging::SyncScope sync_scope (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the reply status for the current request.
@@ -135,20 +135,20 @@ namespace TAO
      * @c TRANSPORT_RETRY, @c UNKNOWN..
      */
     virtual PortableInterceptor::ReplyStatus reply_status (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// If the reply status is
     /// @c PortableInterceptor::LOCATION_FORWARD return the
     /// object reference to which the request was forwarded.
     virtual CORBA::Object_ptr forward_reference (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
     /// Retrieve data from the "request scope" @c PICurrent object.
     virtual CORBA::Any * get_slot (
                                    PortableInterceptor::SlotId id
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::InvalidSlot));
 
@@ -156,14 +156,14 @@ namespace TAO
     /// @c IOP::ServiceId from the request service context list.
     virtual IOP::ServiceContext * get_request_service_context (
         IOP::ServiceId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the @c IOP::ServiceContext with the given
     /// @c IOP::ServiceId from the reply service context list.
     virtual IOP::ServiceContext * get_reply_service_context (
         IOP::ServiceId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return an @c Any containing the exception being sent, if any.
@@ -173,59 +173,59 @@ namespace TAO
      *       @c Any.
      */
     virtual CORBA::Any * sending_exception (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the @c ObjectId for the target object.
     virtual PortableInterceptor::ObjectId * object_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the @c AdapterId for the POA handling the current
     /// request.
     virtual CORBA::OctetSeq * adapter_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the server_id of the server. The value is passed to
     /// the ORB via @c -ORBServerId parameter.
-    virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * server_id (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the ORBId value that is passed to the @c ORB_init
     /// call.
-    virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * orb_id (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the name of the object adapter that services requests
     /// for the invoked object.
     virtual PortableInterceptor::AdapterName * adapter_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the most derived interface of the target object.
     virtual char * target_most_derived_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the policy of the given type in effect for the current
     /// request.
     virtual CORBA::Policy_ptr get_server_policy (
         CORBA::PolicyType type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Insert data into the "request scope" @c PICurrent object.
     virtual void set_slot (PortableInterceptor::SlotId id,
                            const CORBA::Any & data
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                           )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::InvalidSlot));
 
     /// Returns true if the target's type corresponds to the given
     /// @c RepositoryId.
     virtual CORBA::Boolean target_is_a (const char * id
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                        )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Add the @c IOP::ServiceContext to the reply (outgoing)
@@ -233,7 +233,7 @@ namespace TAO
     virtual void add_reply_service_context (
         const IOP::ServiceContext & service_context,
         CORBA::Boolean replace
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   public:
@@ -270,7 +270,7 @@ namespace TAO
     IOP::ServiceContext * get_service_context_i (
         TAO_Service_Context & service_context_list,
         IOP::ServiceId id
-        ACE_ENV_ARG_DECL)
+        )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   protected:
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
index 6b2190b9629..49e43634e81 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
@@ -90,7 +90,7 @@ PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
 PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor::_narrow (
     ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return ServerRequestInterceptor::_duplicate (
@@ -101,7 +101,7 @@ PortableInterceptor::ServerRequestInterceptor::_narrow (
 PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
     ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return ServerRequestInterceptor::_duplicate (
@@ -129,7 +129,7 @@ PortableInterceptor::ServerRequestInterceptor::_tao_release (ServerRequestInterc
 ::CORBA::Boolean
 PortableInterceptor::ServerRequestInterceptor::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
index ec784b9d706..0414e800f56 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
@@ -130,12 +130,12 @@ namespace PortableInterceptor
 
     static ServerRequestInterceptor_ptr _narrow (
         ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static ServerRequestInterceptor_ptr _unchecked_narrow (
         ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static ServerRequestInterceptor_ptr _nil (void)
@@ -153,7 +153,7 @@ namespace PortableInterceptor
     virtual void tao_ft_interception_point (
         ::PortableInterceptor::ServerRequestInfo_ptr ri,
         ::CORBA::OctetSeq_out os
-        ACE_ENV_ARG_DECL_NOT_USED
+
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
@@ -167,7 +167,7 @@ namespace PortableInterceptor
 
     virtual void receive_request_service_contexts (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
@@ -179,7 +179,7 @@ namespace PortableInterceptor
 
     virtual void receive_request (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
@@ -191,7 +191,7 @@ namespace PortableInterceptor
 
     virtual void send_reply (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -202,7 +202,7 @@ namespace PortableInterceptor
 
     virtual void send_exception (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
@@ -214,7 +214,7 @@ namespace PortableInterceptor
 
     virtual void send_other (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
@@ -226,7 +226,7 @@ namespace PortableInterceptor
 
     virtual ::CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;