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

31 files changed, 307 insertions, 430 deletions

diff --git a/TAO/tao/PI/ClientRequestDetails.cpp b/TAO/tao/PI/ClientRequestDetails.cpp
index 969f8adfde2..dd606ef9a8f 100644
--- a/TAO/tao/PI/ClientRequestDetails.cpp
+++ b/TAO/tao/PI/ClientRequestDetails.cpp
@@ -17,7 +17,7 @@ namespace TAO
   void
   ClientRequestDetails::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/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h
index ec4666ae047..80abab464d6 100644
--- a/TAO/tao/PI/ClientRequestDetails.h
+++ b/TAO/tao/PI/ClientRequestDetails.h
@@ -55,7 +55,7 @@ namespace TAO
     ClientRequestDetails (void);
 
     void apply_policies (const CORBA::PolicyList& policies
-                         ACE_ENV_ARG_DECL);
+                        );
 
     /// Returns true if the ProcessingMode setting permits the "firing"
     /// of the associated client request interceptor based upon the
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index f3df9f77449..93eff12f2fb 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -63,7 +63,7 @@ IOP::ServiceContext *
 TAO_ClientRequestInfo::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;
@@ -83,31 +83,28 @@ TAO_ClientRequestInfo::get_service_context_i (
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::target (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::target (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->check_validity ();
 
   return CORBA::Object::_duplicate (this->invocation_->target ());
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::effective_target (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::effective_target (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->check_validity ();
 
   return CORBA::Object::_duplicate (this->invocation_->effective_target ());
 }
 
 IOP::TaggedProfile *
-TAO_ClientRequestInfo::effective_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::effective_profile (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   IOP::TaggedProfile *tagged_profile = 0;
   ACE_NEW_THROW_EX (tagged_profile,
@@ -117,7 +114,6 @@ TAO_ClientRequestInfo::effective_profile (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   IOP::TaggedProfile_var safe_tagged_profile = tagged_profile;
 
@@ -145,11 +141,10 @@ TAO_ClientRequestInfo::effective_profile (ACE_ENV_SINGLE_ARG_DECL)
 // exception from an Any. This method is in place just to be compliant
 // with the spec.
 CORBA::Any *
-TAO_ClientRequestInfo::received_exception (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::received_exception (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   if (this->invocation_->reply_status () != PortableInterceptor::SYSTEM_EXCEPTION
       && this->invocation_->reply_status () != PortableInterceptor::USER_EXCEPTION)
@@ -171,7 +166,6 @@ TAO_ClientRequestInfo::received_exception (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CORBA::Any_var caught_exception_var = temp;
 
@@ -186,11 +180,10 @@ TAO_ClientRequestInfo::received_exception (ACE_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ClientRequestInfo::received_exception_id (
-    ACE_ENV_SINGLE_ARG_DECL)
+    void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   CORBA::Exception *caught_exception =
     invocation_->caught_exception ();
@@ -208,11 +201,10 @@ TAO_ClientRequestInfo::received_exception_id (
 IOP::TaggedComponent *
 TAO_ClientRequestInfo::get_effective_component (
     IOP::ComponentId id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   TAO_Stub *stub =
     this->invocation_->effective_target ()->_stubobj ();
@@ -238,7 +230,6 @@ TAO_ClientRequestInfo::get_effective_component (
                                 TAO::VMCID,
                                 ENOMEM),
                               CORBA::COMPLETED_NO));
-          ACE_CHECK_RETURN (0);
 
           IOP::TaggedComponent_var safe_tagged_component =
             tagged_component;
@@ -259,11 +250,10 @@ TAO_ClientRequestInfo::get_effective_component (
 IOP::TaggedComponentSeq *
 TAO_ClientRequestInfo::get_effective_components (
     IOP::ComponentId id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   TAO_Stub *stub =
     this->invocation_->target ()->_stubobj ();
@@ -292,7 +282,6 @@ TAO_ClientRequestInfo::get_effective_components (
                                     TAO::VMCID,
                                     ENOMEM),
                                   CORBA::COMPLETED_NO));
-              ACE_CHECK_RETURN (0);
 
               safe_tagged_components = tagged_components;
             }
@@ -319,17 +308,16 @@ TAO_ClientRequestInfo::get_effective_components (
 
 CORBA::Policy_ptr
 TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type
-                                           ACE_ENV_ARG_DECL)
+                                           )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  this->check_validity ();
 
   // @@ Do we need to look anywhere else for the request policies?
 
 #if TAO_HAS_CORBA_MESSAGING == 1
   return this->invocation_->target ()->_get_policy (type
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                   );
 #else
   ACE_UNUSED_ARG (type);
 
@@ -346,11 +334,10 @@ void
 TAO_ClientRequestInfo::add_request_service_context (
     const IOP::ServiceContext & service_context,
     CORBA::Boolean replace
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   // Get the service context from the list
   TAO_Service_Context &service_context_list =
@@ -358,17 +345,16 @@ TAO_ClientRequestInfo::add_request_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));
     }
 }
 
 CORBA::ULong
-TAO_ClientRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::request_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // @todo We may have to worry about AMI once we support interceptors
   //       in AMI requests since the Invocation object no longer
@@ -450,27 +436,24 @@ TAO_ClientRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-TAO_ClientRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::operation (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   return CORBA::string_dup (
     this->invocation_->operation_details ().opname  ());
 }
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::arguments (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // Generate the argument list on demand.
   Dynamic::ParameterList *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;
 
@@ -480,7 +463,7 @@ TAO_ClientRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
 
   return safe_parameter_list._retn ();
 
-  //return this->invocation_->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
+  //return this->invocation_->arguments ();
 }
 
 bool
@@ -502,15 +485,13 @@ TAO_ClientRequestInfo::parameter_list (Dynamic::ParameterList &param_list)
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::exceptions (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   Dynamic::ExceptionList *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;
 
@@ -545,11 +526,10 @@ TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list)
 }
 
 Dynamic::ContextList *
-TAO_ClientRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::contexts (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
                                           CORBA::COMPLETED_NO),
@@ -557,11 +537,10 @@ TAO_ClientRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::RequestContext *
-TAO_ClientRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::operation_context (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
                                           CORBA::COMPLETED_NO),
@@ -569,17 +548,15 @@ TAO_ClientRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any *
-TAO_ClientRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::result (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // Generate the result on demand.
   static const CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    TAO_RequestInfo_Util::make_any (tk_void_any);
 
   CORBA::Any_var safe_result_any = result_any;
 
@@ -602,31 +579,28 @@ TAO_ClientRequestInfo::result (CORBA::Any *any)
 }
 
 CORBA::Boolean
-TAO_ClientRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::response_expected (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   return this->invocation_->response_expected ();
 }
 
 Messaging::SyncScope
-TAO_ClientRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::sync_scope (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   return this->invocation_->operation_details ().response_flags ();
 }
 
 PortableInterceptor::ReplyStatus
-TAO_ClientRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::reply_status (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableInterceptor::SYSTEM_EXCEPTION);
+  this->check_validity ();
 
   if (this->invocation_->reply_status() == -1)
     {
@@ -640,11 +614,10 @@ TAO_ClientRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::forward_reference (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->check_validity ();
 
   if (this->invocation_->reply_status() != PortableInterceptor::LOCATION_FORWARD)
     {
@@ -661,25 +634,23 @@ TAO_ClientRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
 
 CORBA::Any *
 TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id
-                                 ACE_ENV_ARG_DECL)
+                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   return this->rs_pi_current_.get_slot (id
-                                        ACE_ENV_ARG_PARAMETER);
+                                       );
 }
 
 IOP::ServiceContext *
 TAO_ClientRequestInfo::get_request_service_context (
     IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // Get the service context from the list
   TAO_Service_Context &service_context_list =
@@ -687,17 +658,16 @@ TAO_ClientRequestInfo::get_request_service_context (
 
   return this->get_service_context_i (service_context_list,
                                       id
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
 }
 
 IOP::ServiceContext *
 TAO_ClientRequestInfo::get_reply_service_context (
     IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // Get the service context from the list
   TAO_Service_Context &service_context_list =
@@ -705,14 +675,14 @@ TAO_ClientRequestInfo::get_reply_service_context (
 
   return this->get_service_context_i (service_context_list,
                                       id
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
 }
 
 void
-TAO_ClientRequestInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::check_validity (void)
 {
   if (this->invocation_ == 0)
-    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
+    throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
                                      CORBA::COMPLETED_NO));
 }
 
diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h
index 4671889f2b1..22abd55b4d9 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -79,50 +79,50 @@ public:
   /// 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)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the operation name for the current request.
   virtual char * operation (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      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 Any with tk_void TypeCode is returned.  This is
   /// 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 true for a two-way operation, and false otherwise.
   virtual CORBA::Boolean response_expected (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
   /// Return the sync_scope policy value for the current one-way
   /// operation.  If the operation is not a one-way, a
   /// 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.
@@ -132,18 +132,18 @@ public:
    * TRANSPORT_RETRY, UNKNOWN.
    */
   virtual PortableInterceptor::ReplyStatus reply_status (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
   /// 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)) ;
 
   virtual CORBA::Any * get_slot (
       PortableInterceptor::SlotId id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
 
@@ -151,30 +151,30 @@ public:
   /// 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 IOP::ServiceContext with the given 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 the (initial, non-forwarded, or permanently forwarded)
   /// object reference of the target.
   virtual CORBA::Object_ptr target (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the object reference for the current target.  The target
   /// may change in the even of a location forward.
   virtual CORBA::Object_ptr effective_target (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IOP::TaggedProfile * effective_profile (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return an Any containing the received exception, if any.
@@ -183,12 +183,12 @@ public:
    * @note There is no trivial way to extract the exception from an Any.
    */
   virtual CORBA::Any * received_exception (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the repository ID for the received exception.
   virtual char * received_exception_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the first IOP::TaggedComponent that matches the given
@@ -196,7 +196,7 @@ public:
   /// target.
   virtual IOP::TaggedComponent * get_effective_component (
       IOP::ComponentId id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return all IOP::TaggedComponent(s) that match the given
@@ -204,14 +204,14 @@ public:
   /// target.
   virtual IOP::TaggedComponentSeq * get_effective_components (
       IOP::ComponentId id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the policy of the given type in effect for the current
   /// request.
   virtual CORBA::Policy_ptr get_request_policy (
       CORBA::PolicyType type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the IOP::ServiceContext to the request (outgoing)
@@ -219,7 +219,7 @@ public:
   virtual void add_request_service_context (
       const IOP::ServiceContext & service_context,
       CORBA::Boolean replace
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
      ACE_THROW_SPEC ((CORBA::SystemException));
 
   /*
@@ -253,7 +253,7 @@ private:
 
   /// Check if this ClientRequestInfo object is called within the
   /// context of a request.
-  void check_validity (ACE_ENV_SINGLE_ARG_DECL);
+  void check_validity (void);
 
   /// Setup thread scope and request scope
   /// PortableInterceptor::Current objects.
@@ -263,7 +263,7 @@ private:
   IOP::ServiceContext *get_service_context_i (
       TAO_Service_Context &service_context_list,
       IOP::ServiceId id
-      ACE_ENV_ARG_DECL)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index 1d1dd7429b2..4d903c3ef9c 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -24,14 +24,14 @@ namespace TAO
   void
   ClientRequestInterceptor_Adapter_Impl::send_request (
       Invocation_Base &invocation
-      ACE_ENV_ARG_DECL)
+      )
   {
     // This method implements one of the "starting" client side
     // interception point.
 
     bool const is_remote_request = invocation.is_remote_request();
 
-    ACE_TRY
+    try
       {
         TAO_ClientRequestInfo ri (&invocation);
 
@@ -44,8 +44,7 @@ namespace TAO
               {
                 registered.interceptor_->
                   send_request (&ri
-                                ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                               );
               }
 
             // The starting interception point completed successfully.
@@ -53,21 +52,18 @@ namespace TAO
             ++invocation.stack_size ();
           }
       }
-    ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+    catch ( ::PortableInterceptor::ForwardRequest& exc)
       {
         this->process_forward_request (invocation,
                                        exc
-                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                      );
       }
-    ACE_ENDTRY;
-    ACE_CHECK;
   }
 
   void
   ClientRequestInterceptor_Adapter_Impl::receive_reply (
     Invocation_Base &invocation
-    ACE_ENV_ARG_DECL)
+    )
   {
     // This is an "ending" interception point so we only process the
     // interceptors pushed on to the flow stack.
@@ -99,8 +95,7 @@ namespace TAO
             registered.interceptor_->
               receive_reply (
                 &ri
-                ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+               );
           }
       }
 
@@ -112,7 +107,7 @@ namespace TAO
   void
   ClientRequestInterceptor_Adapter_Impl::receive_exception (
       Invocation_Base &invocation
-      ACE_ENV_ARG_DECL)
+      )
   {
     // This is an "ending" interception point so we only process the
     // interceptors pushed on to the flow stack.
@@ -122,7 +117,7 @@ namespace TAO
     // Notice that the interceptors are processed in the opposite order
     // they were pushed onto the stack since this is an "ending"
     // interception point.
-    ACE_TRY
+    try
       {
         TAO_ClientRequestInfo ri (&invocation);
 
@@ -145,19 +140,17 @@ namespace TAO
                 registered.interceptor_->
                   receive_exception (
                     &ri
-                    ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                   );
               }
           }
       }
-    ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+    catch ( ::PortableInterceptor::ForwardRequest& exc)
       {
         this->process_forward_request (invocation,
                                        exc
-                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                      );
       }
-    ACE_CATCHANY
+    catch ( ::CORBA::Exception& ex)
       {
         // The receive_exception() interception point in the remaining
         // interceptors must be called so call this method (not the
@@ -171,8 +164,7 @@ namespace TAO
 
         invocation.exception (&ACE_ANY_EXCEPTION);
 
-        this->receive_exception (invocation ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->receive_exception (invocation);
 
         PortableInterceptor::ReplyStatus status =
           this->reply_status (invocation);
@@ -182,16 +174,14 @@ namespace TAO
         // LOCATION_FORWARD).
         if (status == PortableInterceptor::SYSTEM_EXCEPTION
             || status == PortableInterceptor::USER_EXCEPTION)
-          ACE_RE_THROW;
+          throw;
       }
-    ACE_ENDTRY;
-    ACE_CHECK;
   }
 
   void
   ClientRequestInterceptor_Adapter_Impl::receive_other (
       Invocation_Base &invocation
-      ACE_ENV_ARG_DECL)
+      )
   {
     // This is an "ending" interception point so we only process the
     // interceptors pushed on to the flow stack.
@@ -202,7 +192,7 @@ namespace TAO
     // they were pushed onto the stack since this is an "ending"
     // interception point.
 
-    ACE_TRY
+    try
       {
         TAO_ClientRequestInfo ri (&invocation);
 
@@ -222,22 +212,16 @@ namespace TAO
 
           if (registered.details_.should_be_processed (is_remote_request))
             {
-              registered.interceptor_->
-                receive_other (
-                  &ri
-                  ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              registered.interceptor_->receive_other (&ri);
             }
         }
       }
-    ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+    catch ( ::PortableInterceptor::ForwardRequest& exc)
       {
         this->process_forward_request (invocation,
-                                       exc
-                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                       exc);
       }
-    ACE_CATCHANY
+    catch ( ::CORBA::Exception& ex)
       {
         // The receive_exception() interception point in the remaining
         // interceptors must be called so call this method (not the
@@ -251,8 +235,7 @@ namespace TAO
 
         invocation.exception (&ACE_ANY_EXCEPTION);
 
-        this->receive_exception (invocation ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->receive_exception (invocation);
 
         PortableInterceptor::ReplyStatus status =
           this->reply_status (invocation);
@@ -262,53 +245,41 @@ namespace TAO
         // LOCATION_FORWARD).
         if (status == PortableInterceptor::SYSTEM_EXCEPTION
             || status == PortableInterceptor::USER_EXCEPTION)
-          ACE_RE_THROW;
+          throw;
       }
-    ACE_ENDTRY;
-    ACE_CHECK;                                      
   }
 
   void
   ClientRequestInterceptor_Adapter_Impl::process_forward_request (
       Invocation_Base &invocation,
-      PortableInterceptor::ForwardRequest &exc
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ForwardRequest &exc)
   {
     invocation.forwarded_reference (exc.forward.in ());
 
     // receive_other() is potentially invoked recursively.
-    this->receive_other (invocation
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->receive_other (invocation);
   }
 
   void
   ClientRequestInterceptor_Adapter_Impl::add_interceptor (
-    PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInterceptor_ptr interceptor)
   {
-    this->interceptor_list_.add_interceptor (interceptor ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->interceptor_list_.add_interceptor (interceptor);
   }
 
   void
   ClientRequestInterceptor_Adapter_Impl::add_interceptor (
     PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-    const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL)
+    const CORBA::PolicyList& policies)
   {
     this->interceptor_list_.add_interceptor (interceptor,
-                                             policies
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                             policies);
   }
 
   void
-  ClientRequestInterceptor_Adapter_Impl::destroy_interceptors (
-    ACE_ENV_SINGLE_ARG_DECL)
+  ClientRequestInterceptor_Adapter_Impl::destroy_interceptors (void)
   {
-    this->interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    this->interceptor_list_.destroy_interceptors ();
   }
 
   PortableInterceptor::ReplyStatus
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
index 4b1a7ebc70c..f37ef7e108d 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
@@ -79,36 +79,36 @@ namespace TAO
     /// This method implements one of the "starting" client side
     /// interception points.
     virtual void send_request (Invocation_Base &invocation
-                               ACE_ENV_ARG_DECL);
+                              );
 
     /// This method implements one of the "ending" client side
     /// interception point.
     virtual void receive_reply (Invocation_Base &invocation
-                                ACE_ENV_ARG_DECL);
+                               );
 
     /// This method implements one of the "ending" client side
     /// interception point.
     virtual void receive_exception (Invocation_Base &invocation
-                                    ACE_ENV_ARG_DECL);
+                                   );
 
     /// This method implements one of the "ending" client side
     /// interception point.
     virtual void receive_other (Invocation_Base &invocation
-                                ACE_ENV_ARG_DECL);
+                               );
     //@}
 
     /// Register an interceptor.
     virtual void add_interceptor (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL);
+     );
 
     /// Register an interceptor with policies.
     virtual void add_interceptor (
       PortableInterceptor::ClientRequestInterceptor_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 PortableInterceptor::ReplyStatus reply_status (
       TAO::Invocation_Base const &invocation_base);
@@ -120,7 +120,7 @@ namespace TAO
     /// to notifying the Invocation object of the LOCATION_FORWARD.
     void process_forward_request (Invocation_Base &invocation,
                                   PortableInterceptor::ForwardRequest &exc
-                                  ACE_ENV_ARG_DECL);
+                                 );
 
   private:
 
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index fe216233ca9..55cb166bcad 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -45,7 +45,7 @@ namespace TAO
   void
   Interceptor_List<InterceptorType,DetailsType>::add_interceptor (
     InterceptorType_ptr_type interceptor
-    ACE_ENV_ARG_DECL)
+    )
   {
     if (!CORBA::is_nil (interceptor))
       {
@@ -59,8 +59,7 @@ namespace TAO
             /// If the Interceptor is not anonymous, make sure an
             /// Interceptor with the same isn't already registered.
             CORBA::String_var name =
-              interceptor->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
+              interceptor->name ();
 
             if (ACE_OS::strlen (name.in ()) != 0)
               {
@@ -87,7 +86,7 @@ namespace TAO
                     if (ACE_OS::strcmp (existing_name.in (),
                                         name.in ()) == 0)
                       {
-                        ACE_THROW (PortableInterceptor::ORBInitInfo::DuplicateName ());
+                        throw (PortableInterceptor::ORBInitInfo::DuplicateName ());
                       }
                   }
               }
@@ -103,7 +102,7 @@ namespace TAO
       }
     else
       {
-        ACE_THROW (
+        throw (
             CORBA::INV_OBJREF (
                 CORBA::SystemException::_tao_minor_code (
                     0,
@@ -120,7 +119,7 @@ namespace TAO
   Interceptor_List<InterceptorType,DetailsType>::add_interceptor (
     InterceptorType_ptr_type interceptor,
     const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL)
+    )
   {
     if (!CORBA::is_nil (interceptor))
       {
@@ -134,8 +133,7 @@ namespace TAO
             /// If the Interceptor is not anonymous, make sure an
             /// Interceptor with the same isn't already registered.
             CORBA::String_var name =
-              interceptor->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
+              interceptor->name ();
 
             if (ACE_OS::strlen (name.in ()) != 0)
               {
@@ -162,7 +160,7 @@ namespace TAO
                     if (ACE_OS::strcmp (existing_name.in (),
                                         name.in ()) == 0)
                       {
-                        ACE_THROW (PortableInterceptor::ORBInitInfo::DuplicateName ());
+                        throw (PortableInterceptor::ORBInitInfo::DuplicateName ());
                       }
                   }
               }
@@ -170,8 +168,7 @@ namespace TAO
 
         // Create a DetailsType object, and attempt to apply the policies.
         DetailsType details;
-        details.apply_policies(policies ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        details.apply_policies(policies);
 
         /// Increase the length of the Interceptor sequence by one.
         const size_t new_len = old_len + 1;
@@ -186,7 +183,7 @@ namespace TAO
       }
     else
       {
-        ACE_THROW (
+        throw (
             CORBA::INV_OBJREF (
                 CORBA::SystemException::_tao_minor_code (
                     0,
@@ -201,12 +198,12 @@ namespace TAO
   template <typename InterceptorType, typename DetailsType>
   void
   Interceptor_List<InterceptorType,DetailsType>::destroy_interceptors (
-    ACE_ENV_SINGLE_ARG_DECL)
+    void)
   {
     size_t const len = this->interceptors_.size ();
     size_t ilen = len;
 
-    ACE_TRY
+    try
       {
         for (size_t k = 0; k < len; ++k)
           {
@@ -215,8 +212,7 @@ namespace TAO
             // invocation occurs afterwards.
             --ilen;
 
-            this->interceptor (k)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            this->interceptor (k)->destroy ();
 
             // Since Interceptor::destroy() can throw an exception,
             // decrease the size of the interceptor array incrementally
@@ -226,7 +222,7 @@ namespace TAO
             this->interceptors_.size (ilen);
           }
       }
-    ACE_CATCHALL
+    catch (...)
       {
         // Exceptions should not be propagated beyond this call.
         if (TAO_debug_level > 3)
@@ -237,8 +233,6 @@ namespace TAO
                         ACE_TEXT ("::destroy_interceptors () \n")));
           }
       }
-    ACE_ENDTRY;
-    ACE_CHECK;
   }
 }
 
diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h
index 5160ec03377..5cfc907fd76 100644
--- a/TAO/tao/PI/Interceptor_List_T.h
+++ b/TAO/tao/PI/Interceptor_List_T.h
@@ -66,14 +66,14 @@ namespace TAO
 
     void add_interceptor (
       InterceptorType_ptr_type i
-      ACE_ENV_ARG_DECL);
+     );
 
     /// Register an interceptor with policies.
     void add_interceptor (InterceptorType_ptr_type i,
                           const CORBA::PolicyList& policies
-                          ACE_ENV_ARG_DECL);
+                         );
 
-    void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
+    void destroy_interceptors (void);
 
     /// Return the registered interceptor in sequence element @a index.
     RegisteredInterceptor& registered_interceptor (
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 7dbc9cb0bb4..9bda8e24fec 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -76,11 +76,10 @@ TAO_ORBInitInfo::~TAO_ORBInitInfo (void)
 }
 
 CORBA::StringSeq *
-TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::arguments (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // In accordance with the C++ mapping for sequences, it is up to the
   // caller to deallocate storage for returned sequences.
@@ -93,7 +92,6 @@ TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
                         0,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CORBA::StringSeq_var safe_args (args);
 
@@ -107,11 +105,10 @@ TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-TAO_ORBInitInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::orb_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // In accordance with the C++ mapping for strings, return a copy.
 
@@ -119,7 +116,7 @@ TAO_ORBInitInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 IOP::CodecFactory_ptr
-TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::codec_factory (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->codec_factory_.in ()))
@@ -141,8 +138,7 @@ TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL)
       if (loader != 0)
         {
           CORBA::Object_var cf =
-            loader->create_object (this->orb_core_->orb (), 0, 0 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (IOP::CodecFactory::_nil ());
+            loader->create_object (this->orb_core_->orb (), 0, 0);
 
           this->codec_factory_ = IOP::CodecFactory::_narrow (cf.in ());
         }
@@ -155,37 +151,33 @@ void
 TAO_ORBInitInfo::register_initial_reference (
     const char * id,
     CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::InvalidName))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   if (id == 0 || ACE_OS::strlen (id) == 0)
-    ACE_THROW (PortableInterceptor::ORBInitInfo::InvalidName ());
-  ACE_CHECK;
+    throw (PortableInterceptor::ORBInitInfo::InvalidName ());
 
   if (CORBA::is_nil (obj))
-    ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 27,
+    throw ( ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 27,
                                  CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table ();
 
   if (table.register_initial_reference (id, obj) == -1)
-    ACE_THROW (PortableInterceptor::ORBInitInfo::InvalidName ());
+    throw (PortableInterceptor::ORBInitInfo::InvalidName ());
 }
 
 CORBA::Object_ptr
 TAO_ORBInitInfo::resolve_initial_references (
     const char * id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::InvalidName))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->check_validity ();
 
   if (id == 0 || ACE_OS::strlen (id) == 0)
     ACE_THROW_RETURN (PortableInterceptor::ORBInitInfo::InvalidName (),
@@ -196,25 +188,23 @@ TAO_ORBInitInfo::resolve_initial_references (
   // mechanism.
   return
     this->orb_core_->orb ()->resolve_initial_references (id
-                                                         ACE_ENV_ARG_PARAMETER);
+                                                        );
 }
 
 void
 TAO_ORBInitInfo::add_client_request_interceptor (
     PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName))
 {
 # if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
-  this->orb_core_->add_interceptor (interceptor ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_core_->add_interceptor (interceptor);
 #else
   ACE_UNUSED_ARG (interceptor);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ( ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
@@ -225,20 +215,18 @@ TAO_ORBInitInfo::add_client_request_interceptor (
 void
 TAO_ORBInitInfo::add_server_request_interceptor (
     PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName))
 {
 # if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
-  this->orb_core_->add_interceptor (interceptor ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_core_->add_interceptor (interceptor);
 
 #else
   ACE_UNUSED_ARG (interceptor);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ( ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
@@ -249,37 +237,35 @@ TAO_ORBInitInfo::add_server_request_interceptor (
 void
 TAO_ORBInitInfo::add_ior_interceptor (
     PortableInterceptor::IORInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   this->orb_core_->add_interceptor (interceptor
-                                     ACE_ENV_ARG_PARAMETER);
+                                    );
 }
 
 void
 TAO_ORBInitInfo::add_client_request_interceptor_with_policy (
     PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
     const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName,
                    CORBA::PolicyError))
 {
 # if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   this->orb_core_->add_interceptor (interceptor,
                                     policies
-                                    ACE_ENV_ARG_PARAMETER);
+                                   );
 #else
   ACE_UNUSED_ARG (interceptor);
   ACE_UNUSED_ARG (policies);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ( ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
@@ -291,23 +277,22 @@ void
 TAO_ORBInitInfo::add_server_request_interceptor_with_policy (
     PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
     const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName,
                    CORBA::PolicyError))
 {
 # if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   this->orb_core_->add_interceptor (interceptor,
                                     policies
-                                    ACE_ENV_ARG_PARAMETER);
+                                   );
 
 #else
   ACE_UNUSED_ARG (interceptor);
   ACE_UNUSED_ARG (policies);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ( ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
@@ -319,13 +304,12 @@ void
 TAO_ORBInitInfo::add_ior_interceptor_with_policy (
     PortableInterceptor::IORInterceptor_ptr interceptor,
     const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName,
                    CORBA::PolicyError))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   // Since there are currently no PI Policies that pertain to
   // IOR Interceptors, we will always raise the NO_IMPLEMENT
@@ -333,7 +317,7 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy (
   // is currently not implemented/supported.
   ACE_UNUSED_ARG (interceptor);
   ACE_UNUSED_ARG (policies);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ( ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
@@ -341,11 +325,10 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy (
 }
 
 PortableInterceptor::SlotId
-TAO_ORBInitInfo::allocate_slot_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::allocate_slot_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
 #if TAO_HAS_INTERCEPTORS == 1
   // No need to acquire a lock.  This only gets called during ORB
@@ -365,32 +348,30 @@ void
 TAO_ORBInitInfo::register_policy_factory (
     CORBA::PolicyType type,
     PortableInterceptor::PolicyFactory_ptr policy_factory
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   TAO::PolicyFactory_Registry_Adapter *registry =
     this->orb_core_->policy_factory_registry ();
 
   if (registry == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ( ::CORBA::INTERNAL ());
     }
 
   registry->register_policy_factory (type,
                                      policy_factory
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
 }
 
 size_t
 TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup
-                                       ACE_ENV_ARG_DECL)
+                                       )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   size_t slot_id = 0;
 
@@ -409,7 +390,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup
 }
 
 void
-TAO_ORBInitInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::check_validity (void)
 {
   if (this->orb_core_ == 0)
     {
@@ -419,23 +400,22 @@ TAO_ORBInitInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
       // this instance to zero when it is done initializing the ORB,
       // which is why we base "existence" on the validity of the ORB
       // core pointer.
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST (0,
+      throw ( ::CORBA::OBJECT_NOT_EXIST (0,
                                           CORBA::COMPLETED_NO));
     }
 }
 
 CORBA::ORB_ptr
-TAO_ORBInitInfo::_get_orb (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::_get_orb (void)
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ORB::_nil ());
+  this->check_validity ();
 
   return CORBA::ORB::_duplicate (this->orb_core_->orb ());
 }
 
 TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (CORBA::is_nil (_tao_objref))
diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h
index 63c78095104..72c2cb20624 100644
--- a/TAO/tao/PI/ORBInitInfo.h
+++ b/TAO/tao/PI/ORBInitInfo.h
@@ -78,18 +78,18 @@ public:
   /// Return the argument vector for the ORB currently being
   /// initialized as a string sequence.
   virtual CORBA::StringSeq * arguments (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the ORBid for the ORB currently being initialized.
   virtual char * orb_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the CodecFactory for the ORB currently being
   /// initialized.
   virtual IOP::CodecFactory_ptr codec_factory (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Register a mapping between a string and a corresponding object
@@ -105,7 +105,7 @@ public:
   virtual void register_initial_reference (
       const char * id,
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::InvalidName));
 
@@ -114,7 +114,7 @@ public:
   /// since the ORB may not be fully initialized yet.
   virtual CORBA::Object_ptr resolve_initial_references (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::InvalidName));
 
@@ -122,7 +122,7 @@ public:
   /// being initialized.
   virtual void add_client_request_interceptor (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
@@ -130,7 +130,7 @@ public:
   /// being initialized.
   virtual void add_server_request_interceptor (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
@@ -138,7 +138,7 @@ public:
   /// initialized.
   virtual void add_ior_interceptor (
       PortableInterceptor::IORInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
@@ -147,7 +147,7 @@ public:
   virtual void add_client_request_interceptor_with_policy (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName,
                      CORBA::PolicyError));
@@ -157,7 +157,7 @@ public:
   virtual void add_server_request_interceptor_with_policy (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName,
                      CORBA::PolicyError));
@@ -167,7 +167,7 @@ public:
   virtual void add_ior_interceptor_with_policy (
       PortableInterceptor::IORInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName,
                      CORBA::PolicyError));
@@ -175,7 +175,7 @@ public:
   /// Reserve a slot in table found within the
   /// PortableInterceptor::Current object.
   virtual PortableInterceptor::SlotId allocate_slot_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Register a policy factory of the given policy type with the ORB
@@ -183,11 +183,11 @@ public:
   virtual void register_policy_factory (
       CORBA::PolicyType type,
       PortableInterceptor::PolicyFactory_ptr policy_factory
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ORB_ptr _get_orb (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      void
     );
   //@}
 
@@ -210,7 +210,7 @@ public:
    */
   size_t allocate_tss_slot_id (
       ACE_CLEANUP_FUNC cleanup
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return a pointer to the ORB Core associated with the ORB being
@@ -249,12 +249,12 @@ public:
 
   static TAO_ORBInitInfo_ptr _narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
 
   static TAO_ORBInitInfo_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
 
   static TAO_ORBInitInfo_ptr _nil (void)
@@ -274,7 +274,7 @@ protected:
   /// Check if this ORBInitInfo instance is valid.  Once post_init()
   /// has been called on each of the ORBInitializers, this ORBInitInfo
   /// is no longer valid.  Throw an exception in that case.
-  void check_validity (ACE_ENV_SINGLE_ARG_DECL);
+  void check_validity (void);
 
 private:
 
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index 1b20c74dcdb..2d45c545dd6 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -42,8 +42,7 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[])
 
   PortableInterceptor::ORBInitializer_var orb_initializer;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       /// Register the PI ORBInitializer.
 
@@ -54,15 +53,13 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[])
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       orb_initializer = temp_orb_initializer;
 
       this->register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                    );
     }
-  ACE_CATCHANY
+  catch ( ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         {
@@ -71,7 +68,6 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[])
         }
       return -1;
     }
-  ACE_ENDTRY;
 #endif /* !TAO_AS_STATIC_LIBS  && TAO_HAS_INTERCEPTORS == 1 */
   return 0;
 }
@@ -97,7 +93,7 @@ TAO::ORBInitializer_Registry::fini (void)
 void
 TAO::ORBInitializer_Registry::register_orb_initializer (
   PortableInterceptor::ORBInitializer_ptr init
-  ACE_ENV_ARG_DECL)
+  )
 {
   if (!CORBA::is_nil (init))
     {
@@ -109,14 +105,14 @@ TAO::ORBInitializer_Registry::register_orb_initializer (
       size_t const cur_len = this->initializers_.size ();
       size_t const new_len = cur_len + 1;
       if (this->initializers_.size (new_len) != 0)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw ( ::CORBA::INTERNAL ());
 
       // Add the given ORBInitializer to the sequence.
       this->initializers_[cur_len] =
         PortableInterceptor::ORBInitializer::_duplicate (init);
     }
   else
-    ACE_THROW (CORBA::INV_OBJREF (
+    throw ( ::CORBA::INV_OBJREF (
                  CORBA::SystemException::_tao_minor_code (
                    0,
                    EINVAL),
@@ -129,7 +125,7 @@ TAO::ORBInitializer_Registry::pre_init (
   int argc,
   char *argv[],
   PortableInterceptor::SlotId &slotid
-  ACE_ENV_ARG_DECL)
+  )
 {
   ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                     guard,
@@ -152,15 +148,13 @@ TAO::ORBInitializer_Registry::pre_init (
                             0,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
 
       TAO_ORBInitInfo_var orb_init_info_ = orb_init_info_temp;
 
       for (size_t i = 0; i < initializer_count; ++i)
         {
           this->initializers_[i]->pre_init (orb_init_info_.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                           );
         }
 
       slotid = orb_init_info_temp->slot_count ();
@@ -181,7 +175,7 @@ TAO::ORBInitializer_Registry::post_init (
   int argc,
   char *argv[],
   PortableInterceptor::SlotId slotid
-  ACE_ENV_ARG_DECL)
+  )
 {
   if (pre_init_count > 0)
     {
@@ -201,15 +195,13 @@ TAO::ORBInitializer_Registry::post_init (
                             0,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK;
 
       TAO_ORBInitInfo_var orb_init_info_ = orb_init_info_temp;
 
       for (size_t i = 0; i < pre_init_count; ++i)
         {
           this->initializers_[i]->post_init (orb_init_info_.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                            );
         }
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -230,8 +222,7 @@ TAO::ORBInitializer_Registry::post_init (
 
           if (pi)
             {
-              pi->initialize (slot_count ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              pi->initialize (slot_count);
             }
         }
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
index cac58a1d4e0..42209ab9be2 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
@@ -65,7 +65,7 @@ namespace TAO
     /// array.
     virtual void register_orb_initializer (
                    PortableInterceptor::ORBInitializer_ptr init
-                   ACE_ENV_ARG_DECL);
+                  );
 
     /// Begin initialization of all registered ORBInitializers before
     /// the ORB itself is initialized.
@@ -74,7 +74,7 @@ namespace TAO
                              int argc,
                              char *argv[],
                              PortableInterceptor::SlotId &slotid
-                             ACE_ENV_ARG_DECL);
+                            );
 
     /// Complete initialization of all registered ORBInitializers after
     /// the ORB has been initialized.
@@ -84,7 +84,7 @@ namespace TAO
                             int argc,
                             char *argv[],
                             PortableInterceptor::SlotId slotid
-                            ACE_ENV_ARG_DECL);
+                           );
 
   private:
     // Prevent copying
diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp
index 61a039a52ed..7035d1aa465 100644
--- a/TAO/tao/PI/PI.cpp
+++ b/TAO/tao/PI/PI.cpp
@@ -35,8 +35,7 @@ TAO_PI_Init::Initializer (void)
 
   PortableInterceptor::ORBInitializer_var orb_initializer;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       /// Register the PI ORBInitializer.
 
@@ -47,15 +46,13 @@ TAO_PI_Init::Initializer (void)
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       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)
     {
       if (TAO_debug_level > 0)
         {
@@ -64,7 +61,6 @@ TAO_PI_Init::Initializer (void)
         }
       return -1;
     }
-  ACE_ENDTRY;
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
   return status;
 }
diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp
index d49e331f594..3230ee92e5d 100644
--- a/TAO/tao/PI/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -32,28 +32,25 @@ TAO::PICurrent::~PICurrent (void)
 
 CORBA::Any *
 TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier
-                         ACE_ENV_ARG_DECL)
+                         )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
-  this->check_validity (identifier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity (identifier);
 
-  return this->tsc ()->get_slot (identifier ACE_ENV_ARG_PARAMETER);
+  return this->tsc ()->get_slot (identifier);
 }
 
 void
 TAO::PICurrent::set_slot (PortableInterceptor::SlotId identifier,
                          const CORBA::Any &data
-                         ACE_ENV_ARG_DECL)
+                         )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
-  this->check_validity (identifier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity (identifier);
 
-  this->tsc ()->set_slot (identifier, data ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->tsc ()->set_slot (identifier, data);
 }
 
 namespace
@@ -90,30 +87,30 @@ TAO::PICurrent::tsc (void)
 
 void
 TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier
-                                ACE_ENV_ARG_DECL)
+                                )
 {
   // If the slot_count is zero, no initialization has been done (if there are
   // no slots, then the PICurrent_impl object is not created as there is no
   // data to copy).
   if (0 == this->slot_count_)
-    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
+    throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
                                      CORBA::COMPLETED_NO));
 
   // No need to acquire a lock for this check.  At this point, these
   // attributes are read only.
   if (identifier >= this->slot_count_)
-    ACE_THROW (PortableInterceptor::InvalidSlot ());
+    throw (PortableInterceptor::InvalidSlot ());
 }
 
 CORBA::ORB_ptr
-TAO::PICurrent::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::PICurrent::_get_orb (void)
 {
   return CORBA::ORB::_duplicate (this->orb_core_.orb ());
 }
 
 void
 TAO::PICurrent::initialize (PortableInterceptor::SlotId sc
-                            ACE_ENV_ARG_DECL)
+                            )
 {
   // Only allow a single initialization; sc is the number of
   // allocated PICurrent data slots the end user wants. If 0
@@ -125,7 +122,7 @@ TAO::PICurrent::initialize (PortableInterceptor::SlotId sc
     // It MUST be called BEFORE we attempt to get/set any
     // PICurrent slot data.
     if (0 != orb_core_.add_tss_cleanup_func (CleanUpPICurrent, this->tss_slot_))
-      ACE_THROW (CORBA::NO_MEMORY (
+      throw ( ::CORBA::NO_MEMORY (
                    CORBA::SystemException::_tao_minor_code (
                      TAO::VMCID,
                      ENOMEM),
diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h
index 4cc3e99a218..97985e1d80d 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -72,20 +72,20 @@ namespace TAO
     /// Retrieve information stored in the slot table at the given
     /// SlotId.
     virtual CORBA::Any *get_slot (PortableInterceptor::SlotId id
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::InvalidSlot));
 
     /// Set information in the slot table at the given SlotId.
     virtual void set_slot (PortableInterceptor::SlotId identifier,
                            const CORBA::Any & data
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                           )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::InvalidSlot));
     //@}
 
     virtual CORBA::ORB_ptr _get_orb (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       );
 
     /// Number of slots allocated in the slot table.
@@ -97,10 +97,10 @@ namespace TAO
 
     /// Verify the validity of the given SlotId.
     void check_validity (const PortableInterceptor::SlotId &identifier
-                         ACE_ENV_ARG_DECL);
+                        );
 
     /// Initialize the PICurrent object.
-    void initialize (PortableInterceptor::SlotId sc ACE_ENV_ARG_DECL);
+    void initialize (PortableInterceptor::SlotId sc);
 
   protected:
     /// Destructor
diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp
index 7cb54b6df2c..5de7cd7f8b1 100644
--- a/TAO/tao/PI/PICurrent_Impl.cpp
+++ b/TAO/tao/PI/PICurrent_Impl.cpp
@@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Any *
 TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier
-                               ACE_ENV_ARG_DECL)
+                               )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -33,7 +33,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier
   {
     if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Lazy copy of self detected at %N,%l\n")));
-    ACE_THROW (CORBA::INTERNAL ());
+    throw ( ::CORBA::INTERNAL ());
   }
 
   // Get the slot table that is currently active
@@ -49,7 +49,6 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier
                             0,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (any);
     }
   else
     {
@@ -63,7 +62,6 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier
                             0,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (any);
     }
 
   return any;
@@ -72,7 +70,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier
 void
 TAO::PICurrent_Impl::set_slot (PortableInterceptor::SlotId identifier,
                                const CORBA::Any & data
-                               ACE_ENV_ARG_DECL)
+                               )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -93,7 +91,7 @@ TAO::PICurrent_Impl::set_slot (PortableInterceptor::SlotId identifier,
   // slots for the reason stated above.
   if (identifier >= this->slot_table_.size ()
       && this->slot_table_.size (identifier + 1) != 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw ( ::CORBA::INTERNAL ());
 
   this->slot_table_[identifier] = CORBA::Any (data);
 }
diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h
index 11876b31acb..ec1c051f91e 100644
--- a/TAO/tao/PI/PICurrent_Impl.h
+++ b/TAO/tao/PI/PICurrent_Impl.h
@@ -59,14 +59,14 @@ namespace TAO
     /// Retrieve information stored in the slot table at the given
     /// SlotId.
     CORBA::Any *get_slot (PortableInterceptor::SlotId identifier
-                          ACE_ENV_ARG_DECL)
+                          )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::InvalidSlot));
 
     /// Set information in the slot table at the given SlotId.
     void set_slot (PortableInterceptor::SlotId identifier,
                    const CORBA::Any & data
-                   ACE_ENV_ARG_DECL)
+                   )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::InvalidSlot));
 
diff --git a/TAO/tao/PI/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp
index 639ad627d58..7f5587703c4 100644
--- a/TAO/tao/PI/PICurrent_Loader.cpp
+++ b/TAO/tao/PI/PICurrent_Loader.cpp
@@ -32,7 +32,7 @@ TAO_PICurrent_Loader::create_object (
   CORBA::ORB_ptr orb,
   int,
   ACE_TCHAR *[]
-  ACE_ENV_ARG_DECL_NOT_USED)
+  )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj = CORBA::Object::_nil ();
diff --git a/TAO/tao/PI/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h
index a1b4e48cfa9..8b6e981c62c 100644
--- a/TAO/tao/PI/PICurrent_Loader.h
+++ b/TAO/tao/PI/PICurrent_Loader.h
@@ -41,7 +41,7 @@ public:
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            ACE_TCHAR *argv []
-                                           ACE_ENV_ARG_DECL)
+                                           )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp
index c138481d1ee..efdf142fb7a 100644
--- a/TAO/tao/PI/PI_ORBInitializer.cpp
+++ b/TAO/tao/PI/PI_ORBInitializer.cpp
@@ -16,18 +16,14 @@ ACE_RCSID (tao,
            "$Id$")
 
 void
-TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG (info);
 }
 
 
 void
-TAO_PI_ORBInitializer::post_init (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The PI policy factory is stateless and reentrant, so share a
@@ -42,22 +38,17 @@ TAO_PI_ORBInitializer::post_init (
                               TAO::VMCID,
                               ENOMEM),
                             CORBA::COMPLETED_NO));
-      ACE_CHECK;
 
       this->policy_factory_ = policy_factory;
     }
 
-
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_policy_factories (info);
 }
 
 
 void
 TAO_PI_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
 {
   // Register the PI policy factory.
 
@@ -72,14 +63,12 @@ TAO_PI_ORBInitializer::register_policy_factories (
 
   for (CORBA::PolicyType *i = type; i != end; ++i)
     {
-      ACE_TRY
+      try
         {
           info->register_policy_factory (*i,
-                                         this->policy_factory_.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                         this->policy_factory_.in ());
         }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+      catch ( ::CORBA::BAD_INV_ORDER& ex)
         {
           if (ex.minor () == (CORBA::OMGVMCID | 16))
             {
@@ -90,15 +79,13 @@ TAO_PI_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;
     }
 }
 
diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h
index 92d62abfef6..f77777cafe6 100644
--- a/TAO/tao/PI/PI_ORBInitializer.h
+++ b/TAO/tao/PI/PI_ORBInitializer.h
@@ -50,11 +50,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));
 
   //@}
@@ -64,7 +64,7 @@ private:
 
   /// Register PortableInterceptor policy factories.
   void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info
-                                  ACE_ENV_ARG_DECL);
+                                 );
 
 
   /// Instance of the PI policy factory.
diff --git a/TAO/tao/PI/PI_PolicyFactory.cpp b/TAO/tao/PI/PI_PolicyFactory.cpp
index 3f82ffff341..c314da293f4 100644
--- a/TAO/tao/PI/PI_PolicyFactory.cpp
+++ b/TAO/tao/PI/PI_PolicyFactory.cpp
@@ -15,7 +15,7 @@ CORBA::Policy_ptr
 TAO_PI_PolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
@@ -34,7 +34,6 @@ TAO_PI_PolicyFactory::create_policy (
                         TAO_ProcessingModePolicy (policy_value),
                         CORBA::NO_MEMORY (TAO::VMCID,
                                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return processing_mode_policy;
     }
diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h
index eb7e4968015..17bd5d9bd0a 100644
--- a/TAO/tao/PI/PI_PolicyFactory.h
+++ b/TAO/tao/PI/PI_PolicyFactory.h
@@ -38,7 +38,7 @@ class TAO_PI_Export TAO_PI_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/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp
index 9c4ed43e4af..8fcaedadd74 100644
--- a/TAO/tao/PI/PolicyFactoryC.cpp
+++ b/TAO/tao/PI/PolicyFactoryC.cpp
@@ -89,7 +89,7 @@ PortableInterceptor::PolicyFactory::~PolicyFactory (void)
 PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::PolicyFactory::_narrow (
     ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return PolicyFactory::_duplicate (
@@ -100,7 +100,7 @@ PortableInterceptor::PolicyFactory::_narrow (
 PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::PolicyFactory::_unchecked_narrow (
     ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return PolicyFactory::_duplicate (
@@ -128,7 +128,7 @@ PortableInterceptor::PolicyFactory::_tao_release (PolicyFactory_ptr obj)
 ::CORBA::Boolean
 PortableInterceptor::PolicyFactory::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -168,7 +168,7 @@ PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &)
 // Hand-crafted.
 ::CORBA::Policy_ptr
 PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
-                                                    ACE_ENV_ARG_DECL)
+                                                    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h
index 9737af6be89..6b1f0a47ecd 100644
--- a/TAO/tao/PI/PolicyFactoryC.h
+++ b/TAO/tao/PI/PolicyFactoryC.h
@@ -108,12 +108,12 @@ namespace PortableInterceptor
 
     static PolicyFactory_ptr _narrow (
         ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static PolicyFactory_ptr _unchecked_narrow (
         ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static PolicyFactory_ptr _nil (void)
@@ -129,7 +129,7 @@ namespace PortableInterceptor
     virtual ::CORBA::Policy_ptr create_policy (
         ::CORBA::PolicyType type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
@@ -139,7 +139,7 @@ namespace PortableInterceptor
     // Hand-crafted addition.
     virtual ::CORBA::Policy_ptr _create_policy (
         CORBA::PolicyType type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -151,7 +151,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;
diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp
index f91af3df5da..5b0b76860a8 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PI/PolicyFactory_Registry.cpp
@@ -34,11 +34,11 @@ void
 TAO_PolicyFactory_Registry::register_policy_factory (
   CORBA::PolicyType type,
   PortableInterceptor::PolicyFactory_ptr policy_factory
-  ACE_ENV_ARG_DECL)
+  )
 {
   if (CORBA::is_nil (policy_factory))
     {
-      ACE_THROW (CORBA::BAD_PARAM (
+      throw ( ::CORBA::BAD_PARAM (
                    CORBA::SystemException::_tao_minor_code (
                      0,
                      EINVAL),
@@ -59,13 +59,13 @@ TAO_PolicyFactory_Registry::register_policy_factory (
       if (result == 1)
         {
           // PolicyFactory of given type already exists.
-          ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 16,
+          throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 16,
                                            CORBA::COMPLETED_NO));
         }
       else
         {
           // Could not add PolicyFactory due to internal bind failures.
-          ACE_THROW (CORBA::INTERNAL ());
+          throw ( ::CORBA::INTERNAL ());
         }
     }
 }
@@ -73,7 +73,7 @@ TAO_PolicyFactory_Registry::register_policy_factory (
 CORBA::Policy_ptr
 TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type,
                                            const CORBA::Any &value
-                                           ACE_ENV_ARG_DECL)
+                                           )
 {
   PortableInterceptor::PolicyFactory_ptr policy_factory =
     PortableInterceptor::PolicyFactory::_nil ();
@@ -89,12 +89,12 @@ TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type,
 
   return policy_factory->create_policy (type,
                                         value
-                                        ACE_ENV_ARG_PARAMETER);
+                                       );
 }
 
 CORBA::Policy_ptr
 TAO_PolicyFactory_Registry::_create_policy (CORBA::PolicyType type
-                                            ACE_ENV_ARG_DECL)
+                                            )
 {
   PortableInterceptor::PolicyFactory_ptr policy_factory =
     PortableInterceptor::PolicyFactory::_nil ();
@@ -110,7 +110,7 @@ TAO_PolicyFactory_Registry::_create_policy (CORBA::PolicyType type
     }
 
   return policy_factory->_create_policy (type
-                                         ACE_ENV_ARG_PARAMETER);
+                                        );
 }
 
 bool
diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h
index 882f386c70c..18ceb0a92d4 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.h
+++ b/TAO/tao/PI/PolicyFactory_Registry.h
@@ -71,18 +71,18 @@ public:
   void register_policy_factory (
     CORBA::PolicyType type,
     PortableInterceptor::PolicyFactory_ptr policy_factory
-    ACE_ENV_ARG_DECL);
+   );
 
   /// Construct a policy of the given type with the information
   /// contained in the CORBA::Any @a value.
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                    const CORBA::Any &value
-                                   ACE_ENV_ARG_DECL);
+                                  );
 
   /// Create an empty policy, usually to be filled in later by
   /// demarshaling.
   CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                    ACE_ENV_ARG_DECL);
+                                   );
 
   /// Check if a @c PolicyFactory corresponding to the given type,
   /// exists.
diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp
index 9f2feccfe82..9530a0956c2 100644
--- a/TAO/tao/PI/ProcessingModePolicy.cpp
+++ b/TAO/tao/PI/ProcessingModePolicy.cpp
@@ -21,33 +21,32 @@ TAO_ProcessingModePolicy::TAO_ProcessingModePolicy
 }
 
 CORBA::Policy_ptr
-TAO_ProcessingModePolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ProcessingModePolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ProcessingModePolicy *copy = 0;
   ACE_NEW_THROW_EX (copy,
                     TAO_ProcessingModePolicy (this->processing_mode_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return copy;
 }
 
 void
-TAO_ProcessingModePolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ProcessingModePolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 PortableInterceptor::ProcessingMode
-TAO_ProcessingModePolicy::processing_mode (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ProcessingModePolicy::processing_mode (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return processing_mode_;
 }
 
 CORBA::PolicyType
-TAO_ProcessingModePolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ProcessingModePolicy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableInterceptor::PROCESSING_MODE_POLICY_TYPE;
diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h
index fe2c82462bf..0b6fbebbcbb 100644
--- a/TAO/tao/PI/ProcessingModePolicy.h
+++ b/TAO/tao/PI/ProcessingModePolicy.h
@@ -47,16 +47,16 @@ public:
   TAO_ProcessingModePolicy (PortableInterceptor::ProcessingMode mode);
 
   virtual PortableInterceptor::ProcessingMode processing_mode
-                                        (ACE_ENV_SINGLE_ARG_DECL)
+                                        (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp
index 65d42175dd2..e05c080d831 100644
--- a/TAO/tao/PI/RequestInfo_Util.cpp
+++ b/TAO/tao/PI/RequestInfo_Util.cpp
@@ -19,7 +19,7 @@ ACE_RCSID (tao,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 Dynamic::ParameterList *
-TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RequestInfo_Util::make_parameter_list (void)
 {
   Dynamic::ParameterList *parameter_list = 0;
   ACE_NEW_THROW_EX (parameter_list,
@@ -36,7 +36,7 @@ TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RequestInfo_Util::make_exception_list (void)
 {
   Dynamic::ExceptionList *exception_list = 0;
   ACE_NEW_THROW_EX (exception_list,
@@ -53,7 +53,7 @@ TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ContextList *
-TAO_RequestInfo_Util::make_context_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RequestInfo_Util::make_context_list (void)
 {
   Dynamic::ContextList *context_list = 0;
   ACE_NEW_THROW_EX (context_list,
@@ -70,7 +70,7 @@ TAO_RequestInfo_Util::make_context_list (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::RequestContext *
-TAO_RequestInfo_Util::make_request_context (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RequestInfo_Util::make_request_context (void)
 {
   Dynamic::RequestContext *request_context = 0;
   ACE_NEW_THROW_EX (request_context,
@@ -88,7 +88,7 @@ TAO_RequestInfo_Util::make_request_context (ACE_ENV_SINGLE_ARG_DECL)
 
 CORBA::Any *
 TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
-                                ACE_ENV_ARG_DECL)
+                                )
 {
   CORBA::Any *any = 0;
   ACE_NEW_THROW_EX (any,
@@ -98,7 +98,6 @@ TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
                         0,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (any);
 
   if (tk_void_any)
     {
diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h
index 4d18f4d2309..240984f3b02 100644
--- a/TAO/tao/PI/RequestInfo_Util.h
+++ b/TAO/tao/PI/RequestInfo_Util.h
@@ -34,7 +34,6 @@ namespace CORBA
 {
   class StringSeq;
   class Any;
-  class Environment;
 }
 
 namespace Dynamic
@@ -66,19 +65,19 @@ public:
    */
   //@{
   static Dynamic::ParameterList * make_parameter_list (
-    ACE_ENV_SINGLE_ARG_DECL);
+    void);
 
   static Dynamic::ExceptionList * make_exception_list (
-    ACE_ENV_SINGLE_ARG_DECL);
+    void);
 
   static Dynamic::ContextList * make_context_list (
-    ACE_ENV_SINGLE_ARG_DECL);
+    void);
 
   static Dynamic::RequestContext * make_request_context (
-    ACE_ENV_SINGLE_ARG_DECL);
+    void);
 
   static CORBA::Any * make_any (CORBA::Boolean tk_void_any
-                                ACE_ENV_ARG_DECL);
+                               );
   //@}
 };