ChangeLogTag:Wed Sep 13 13:41:44 2000 Nanbor Wang <nanbor@cs.wustl.edu>

8 files changed, 717 insertions, 672 deletions

diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 8dea880cf75..a226eb0561c 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -253,7 +253,7 @@ CORBA::Environment &)
 {}
 
 Dynamic::ParameterList *
-CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy::arguments (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy::arguments (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
    // Generate the arg list on demand
@@ -267,23 +267,23 @@ CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_polic
     return &this->parameter_list_;
 }
 
-Dynamic::ExceptionList *
-CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy::exceptions (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand
-  return 0;
+  Dynamic::ExceptionList *
+  CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy::exceptions (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    // Generate the exception list on demand
+    return 0;
 }
 
 
-CORBA::Any *
-CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy::result (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand :
-  this->result_val_ <<= this->result_;
+      CORBA::Any *
+  CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy::result (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+ // Generate the result on demand :
+    this->result_val_ <<= this->result_;
   return &this->result_val_;
-}
+  }
 
 void
 CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy::result (CORBA::Policy_ptr  result)
@@ -534,43 +534,43 @@ CORBA::Environment &)
 {}
 
 Dynamic::ParameterList *
-CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::arguments (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::arguments (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // Generate the arg list on demand
+   // Generate the arg list on demand
   CORBA::ULong length = 0;
-  length = this->parameter_list_.length ();
-  this->parameter_list_.length (length + 1);
-  this->parameter_list_[length].argument <<=  this->object_type_;
+        length = this->parameter_list_.length ();
+      this->parameter_list_.length (length + 1);
+      this->parameter_list_[length].argument <<=  this->object_type_;
 
-  this->parameter_list_[length].mode = Dynamic::PARAM_IN;
-  length = this->parameter_list_.length ();
-  this->parameter_list_.length (length + 1);
-  this->parameter_list_[length].argument <<= CORBA::Any::from_boolean (this->constr_policy_ );
-  this->parameter_list_[length].mode = Dynamic::PARAM_IN;
+    this->parameter_list_[length].mode = Dynamic::PARAM_IN;
+                length = this->parameter_list_.length ();
+        this->parameter_list_.length (length + 1);
+        this->parameter_list_[length].argument <<= CORBA::Any::from_boolean (this->constr_policy_ );
+      this->parameter_list_[length].mode = Dynamic::PARAM_IN;
 
-  return &this->parameter_list_;
+      return &this->parameter_list_;
 }
 
-Dynamic::ExceptionList *
-CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::exceptions (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand
-  return 0;
+    Dynamic::ExceptionList *
+    CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::exceptions (CORBA::Environment &)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      // Generate the exception list on demand
+      return 0;
 }
 
 
-CORBA::Any *
-CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::result (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand :
-  CORBA::TypeCode tc (CORBA::tk_void);
-  this->result_val_.type (&tc);
+          CORBA::Any *
+    CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::result (CORBA::Environment &)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+ // Generate the result on demand :
+     CORBA::TypeCode tc (CORBA::tk_void);
+    this->result_val_.type (&tc);
 
-  return &this->result_val_;
-}
+    return &this->result_val_;
+    }
 
 #endif /* TAO_HAS_INTERCEPTORS && TAO_HAS_INTERFACE_REPOSITORY */
 
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 4bef2397d56..2401f2c3464 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -185,14 +185,20 @@ class TAO_Export CORBA_DomainManager : public virtual CORBA_Object
         TAO_default_environment ()
       );
 
-      virtual Dynamic::ParameterList * arguments (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+       virtual Dynamic::ParameterList * arguments (
+        CORBA::Environment &ACE_TRY_ENV =
+           TAO_default_environment ())
+       ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual Dynamic::ExceptionList * exceptions (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+        virtual Dynamic::ExceptionList * exceptions (
+      CORBA::Environment &ACE_TRY_ENV =
+         TAO_default_environment ())
+     ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Any * result (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Any * result (
+    CORBA::Environment &ACE_TRY_ENV =
+       TAO_default_environment ())
+   ACE_THROW_SPEC ((CORBA::SystemException));
 
 
 private:
@@ -334,14 +340,20 @@ private:
       TAO_default_environment ()
     );
 
-    virtual Dynamic::ParameterList * arguments (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+     virtual Dynamic::ParameterList * arguments (
+      CORBA::Environment &ACE_TRY_ENV =
+         TAO_default_environment ())
      ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual Dynamic::ExceptionList * exceptions (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual Dynamic::ExceptionList * exceptions (
+    CORBA::Environment &ACE_TRY_ENV =
+       TAO_default_environment ())
    ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual CORBA::Any * result (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+virtual CORBA::Any * result (
+  CORBA::Environment &ACE_TRY_ENV =
+     TAO_default_environment ())
+ ACE_THROW_SPEC ((CORBA::SystemException));
 
 
 private:
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index c17fdb57286..571c5ac6ae5 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -21,7 +21,7 @@ static const CORBA::Long _oc_PortableInterceptor_RepositoryId[] =
   TAO_ENCAP_BYTE_ORDER, // byte order
   41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72636570), ACE_NTOHL (0x746f722f), ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:PortableInterceptor/RepositoryId:1.0
   13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-  CORBA::tk_string,
+  CORBA::tk_string, 
   0U, // string length
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_RepositoryId (CORBA::tk_alias, sizeof (_oc_PortableInterceptor_RepositoryId), (char *) &_oc_PortableInterceptor_RepositoryId, 0, sizeof (PortableInterceptor::RepositoryId));
@@ -40,30 +40,30 @@ TAO_NAMESPACE_END
 PortableInterceptor::OctetSeq::OctetSeq (void)
 {}
 PortableInterceptor::OctetSeq::OctetSeq (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 PortableInterceptor::OctetSeq::OctetSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 PortableInterceptor::OctetSeq::OctetSeq (const OctetSeq &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 PortableInterceptor::OctetSeq::~OctetSeq (void) // dtor
@@ -106,30 +106,30 @@ TAO_NAMESPACE_END
 PortableInterceptor::StringSeq::StringSeq (void)
 {}
 PortableInterceptor::StringSeq::StringSeq (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 PortableInterceptor::StringSeq::StringSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 PortableInterceptor::StringSeq::StringSeq (const StringSeq &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 PortableInterceptor::StringSeq::~StringSeq (void) // dtor
@@ -151,7 +151,7 @@ static const CORBA::Long _oc_PortableInterceptor_StringSeq[] =
   CORBA::tk_sequence, // typecode kind
   16, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_string,
+    CORBA::tk_string, 
     0U, // string length
     0U,
 
@@ -213,11 +213,11 @@ PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_unchecke
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::PortableInterceptor::Interceptor (stub), Interceptor::_nil ());
-
+     
       return default_proxy;
-
+      
     }
-  else
+  else 
     return
       ACE_reinterpret_cast
         (
@@ -248,15 +248,15 @@ char * PortableInterceptor::Interceptor::name (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::String_var _tao_safe_retval;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_name",
@@ -271,7 +271,7 @@ char * PortableInterceptor::Interceptor::name (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -295,7 +295,7 @@ char * PortableInterceptor::Interceptor::name (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -320,7 +320,7 @@ void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -666,7 +666,7 @@ PortableInterceptor::Current_ptr PortableInterceptor::Current::_unchecked_narrow
         return default_proxy;
 
     }
-  else
+  else 
     return
       ACE_reinterpret_cast
         (
@@ -699,20 +699,20 @@ CORBA::Any * PortableInterceptor::Current::get_slot (
     PortableInterceptor::InvalidSlot
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_Current_get_slot_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_Current_get_slot_exceptiondata [] = 
   {
     {PortableInterceptor::_tc_InvalidSlot, PortableInterceptor::InvalidSlot::_alloc}
   };
 
   CORBA::Any *_tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, CORBA::Any, _tao_retval);
   CORBA::Any_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -729,7 +729,7 @@ CORBA::Any * PortableInterceptor::Current::get_slot (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -759,7 +759,7 @@ CORBA::Any * PortableInterceptor::Current::get_slot (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -774,20 +774,20 @@ void PortableInterceptor::Current::set_slot (
     PortableInterceptor::InvalidSlot
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_Current_set_slot_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_Current_set_slot_exceptiondata [] = 
   {
     {PortableInterceptor::_tc_InvalidSlot, PortableInterceptor::InvalidSlot::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "set_slot",
@@ -802,7 +802,7 @@ void PortableInterceptor::Current::set_slot (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -825,7 +825,7 @@ void PortableInterceptor::Current::set_slot (
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
       break;
-
+      
     }
 
 }
@@ -863,7 +863,7 @@ void *PortableInterceptor::Current::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -886,15 +886,15 @@ const char* PortableInterceptor::Current::_interface_repository_id (void) const
   TAO_NAMESPACE_BEGIN (PortableInterceptor)
   TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Current, &_tc_TAO_tc_PortableInterceptor_Current)
   TAO_NAMESPACE_END
-
+    
   // default constructor
   PortableInterceptor::RequestInfo::RequestInfo (void)
   {}
-
+  
   // destructor
   PortableInterceptor::RequestInfo::~RequestInfo (void)
   {}
-
+  
   void PortableInterceptor::RequestInfo::_tao_any_destructor (void *x)
   {
     RequestInfo *tmp = ACE_static_cast (RequestInfo*,x);
@@ -917,7 +917,7 @@ const char* PortableInterceptor::Current::_interface_repository_id (void) const
       }
     return RequestInfo::_unchecked_narrow (obj, ACE_TRY_ENV);
   }
-
+  
   PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_unchecked_narrow (
       CORBA::Object_ptr obj,
       CORBA::Environment &
@@ -941,7 +941,7 @@ const char* PortableInterceptor::Current::_interface_repository_id (void) const
           return default_proxy;
 
       }
-    else
+    else 
       return
         ACE_reinterpret_cast
           (
@@ -972,15 +972,15 @@ CORBA::ULong PortableInterceptor::RequestInfo::request_id (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::ULong _tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_request_id",
@@ -995,7 +995,7 @@ CORBA::ULong PortableInterceptor::RequestInfo::request_id (
       ACE_CHECK_RETURN  (_tao_retval);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -1019,7 +1019,7 @@ CORBA::ULong PortableInterceptor::RequestInfo::request_id (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
 
     break;
-
+    
   }
 return _tao_retval;
 }
@@ -1031,15 +1031,15 @@ char * PortableInterceptor::RequestInfo::operation (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::String_var _tao_safe_retval;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_operation",
@@ -1054,7 +1054,7 @@ char * PortableInterceptor::RequestInfo::operation (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -1078,25 +1078,27 @@ char * PortableInterceptor::RequestInfo::operation (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
 
-Dynamic::ParameterList * PortableInterceptor::RequestInfo::arguments (TAO_ENV_SINGLE_ARG_DECL)
+Dynamic::ParameterList * PortableInterceptor::RequestInfo::arguments (
+    CORBA::Environment &ACE_TRY_ENV
+  )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  TAO_ENV_ARG_DEFN;
+  
   Dynamic::ParameterList *_tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, Dynamic::ParameterList, _tao_retval);
   Dynamic::ParameterList_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1112,7 +1114,7 @@ Dynamic::ParameterList * PortableInterceptor::RequestInfo::arguments (TAO_ENV_SI
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -1136,25 +1138,27 @@ Dynamic::ParameterList * PortableInterceptor::RequestInfo::arguments (TAO_ENV_SI
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
 
-Dynamic::ExceptionList * PortableInterceptor::RequestInfo::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+Dynamic::ExceptionList * PortableInterceptor::RequestInfo::exceptions (
+    CORBA::Environment &ACE_TRY_ENV
+  )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  TAO_ENV_ARG_DEFN;
+  
   Dynamic::ExceptionList *_tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, Dynamic::ExceptionList, _tao_retval);
   Dynamic::ExceptionList_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1171,7 +1175,7 @@ Dynamic::ExceptionList * PortableInterceptor::RequestInfo::exceptions (TAO_ENV_S
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -1195,7 +1199,7 @@ Dynamic::ExceptionList * PortableInterceptor::RequestInfo::exceptions (TAO_ENV_S
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -1207,15 +1211,15 @@ Dynamic::ContextList * PortableInterceptor::RequestInfo::contexts (
     CORBA::SystemException
   ))
 {
-
+  
   Dynamic::ContextList *_tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, Dynamic::ContextList, _tao_retval);
   Dynamic::ContextList_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1232,7 +1236,7 @@ Dynamic::ContextList * PortableInterceptor::RequestInfo::contexts (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -1256,7 +1260,7 @@ Dynamic::ContextList * PortableInterceptor::RequestInfo::contexts (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -1268,15 +1272,15 @@ Dynamic::RequestContext * PortableInterceptor::RequestInfo::operation_context (
     CORBA::SystemException
   ))
 {
-
+  
   Dynamic::RequestContext *_tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, Dynamic::RequestContext, _tao_retval);
   Dynamic::RequestContext_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1293,7 +1297,7 @@ Dynamic::RequestContext * PortableInterceptor::RequestInfo::operation_context (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -1317,25 +1321,27 @@ Dynamic::RequestContext * PortableInterceptor::RequestInfo::operation_context (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
 
-CORBA::Any * PortableInterceptor::RequestInfo::result (TAO_ENV_SINGLE_ARG_DECL)
+CORBA::Any * PortableInterceptor::RequestInfo::result (
+    CORBA::Environment &ACE_TRY_ENV
+  )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  TAO_ENV_ARG_DEFN;
+  
   CORBA::Any *_tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, CORBA::Any, _tao_retval);
   CORBA::Any_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1352,7 +1358,7 @@ CORBA::Any * PortableInterceptor::RequestInfo::result (TAO_ENV_SINGLE_ARG_DECL)
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -1376,7 +1382,7 @@ CORBA::Any * PortableInterceptor::RequestInfo::result (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -1388,15 +1394,15 @@ CORBA::Boolean PortableInterceptor::RequestInfo::response_expected (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::Boolean _tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_response_expected",
@@ -1410,7 +1416,7 @@ CORBA::Boolean PortableInterceptor::RequestInfo::response_expected (
       ACE_CHECK_RETURN  (_tao_retval);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -1434,7 +1440,7 @@ CORBA::Boolean PortableInterceptor::RequestInfo::response_expected (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
 
     break;
-
+    
   }
 return _tao_retval;
 }
@@ -1446,15 +1452,15 @@ Messaging::SyncScope PortableInterceptor::RequestInfo::sync_scope (
     CORBA::SystemException
   ))
 {
-
+  
   Messaging::SyncScope _tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_sync_scope",
@@ -1469,7 +1475,7 @@ Messaging::SyncScope PortableInterceptor::RequestInfo::sync_scope (
       ACE_CHECK_RETURN  (_tao_retval);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -1493,7 +1499,7 @@ Messaging::SyncScope PortableInterceptor::RequestInfo::sync_scope (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
 
     break;
-
+    
   }
 return _tao_retval;
 }
@@ -1505,15 +1511,15 @@ PortableInterceptor::ReplyStatus PortableInterceptor::RequestInfo::reply_status
     CORBA::SystemException
   ))
 {
-
+  
   PortableInterceptor::ReplyStatus _tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_reply_status",
@@ -1528,7 +1534,7 @@ PortableInterceptor::ReplyStatus PortableInterceptor::RequestInfo::reply_status
       ACE_CHECK_RETURN  (_tao_retval);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -1552,7 +1558,7 @@ PortableInterceptor::ReplyStatus PortableInterceptor::RequestInfo::reply_status
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
 
     break;
-
+    
   }
 return _tao_retval;
 }
@@ -1564,16 +1570,16 @@ CORBA::Object_ptr PortableInterceptor::RequestInfo::forward_reference (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
   CORBA::Object_var _tao_safe_retval (_tao_retval);
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_forward_reference",
@@ -1588,7 +1594,7 @@ CORBA::Object_ptr PortableInterceptor::RequestInfo::forward_reference (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -1612,7 +1618,7 @@ CORBA::Object_ptr PortableInterceptor::RequestInfo::forward_reference (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -1626,20 +1632,20 @@ CORBA::Any * PortableInterceptor::RequestInfo::get_slot (
     PortableInterceptor::InvalidSlot
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_RequestInfo_get_slot_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_RequestInfo_get_slot_exceptiondata [] = 
   {
     {PortableInterceptor::_tc_InvalidSlot, PortableInterceptor::InvalidSlot::_alloc}
   };
 
   CORBA::Any *_tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, CORBA::Any, _tao_retval);
   CORBA::Any_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1655,7 +1661,7 @@ CORBA::Any * PortableInterceptor::RequestInfo::get_slot (
       _tao_call.start (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -1685,7 +1691,7 @@ CORBA::Any * PortableInterceptor::RequestInfo::get_slot (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -1698,14 +1704,14 @@ IOP::ServiceContext * PortableInterceptor::RequestInfo::get_request_service_cont
     CORBA::SystemException
   ))
 {
-
+  
   IOP::ServiceContext *_tao_retval = 0;
-
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, IOP::ServiceContext, _tao_retval);
   IOP::ServiceContext_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1722,7 +1728,7 @@ IOP::ServiceContext * PortableInterceptor::RequestInfo::get_request_service_cont
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -1752,7 +1758,7 @@ IOP::ServiceContext * PortableInterceptor::RequestInfo::get_request_service_cont
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -1765,14 +1771,14 @@ IOP::ServiceContext * PortableInterceptor::RequestInfo::get_reply_service_contex
     CORBA::SystemException
   ))
 {
-
+  
   IOP::ServiceContext *_tao_retval = 0;
-
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, IOP::ServiceContext, _tao_retval);
   IOP::ServiceContext_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1788,7 +1794,7 @@ IOP::ServiceContext * PortableInterceptor::RequestInfo::get_reply_service_contex
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -1818,7 +1824,7 @@ IOP::ServiceContext * PortableInterceptor::RequestInfo::get_reply_service_contex
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -1843,7 +1849,7 @@ void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1921,7 +1927,7 @@ PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInf
         return default_proxy;
 
     }
-  else
+  else 
     return
       ACE_reinterpret_cast
         (
@@ -1952,16 +1958,16 @@ CORBA::Object_ptr PortableInterceptor::ClientRequestInfo::target (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
   CORBA::Object_var _tao_safe_retval (_tao_retval);
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_target",
@@ -1976,7 +1982,7 @@ CORBA::Object_ptr PortableInterceptor::ClientRequestInfo::target (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -2000,7 +2006,7 @@ CORBA::Object_ptr PortableInterceptor::ClientRequestInfo::target (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -2012,16 +2018,16 @@ CORBA::Object_ptr PortableInterceptor::ClientRequestInfo::effective_target (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
   CORBA::Object_var _tao_safe_retval (_tao_retval);
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_effective_target",
@@ -2035,7 +2041,7 @@ CORBA::Object_ptr PortableInterceptor::ClientRequestInfo::effective_target (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -2059,7 +2065,7 @@ CORBA::Object_ptr PortableInterceptor::ClientRequestInfo::effective_target (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -2071,14 +2077,14 @@ IOP::TaggedProfile * PortableInterceptor::ClientRequestInfo::effective_profile (
     CORBA::SystemException
   ))
 {
-
+  
   IOP::TaggedProfile *_tao_retval = 0;
-
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, IOP::TaggedProfile, _tao_retval);
   IOP::TaggedProfile_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -2095,7 +2101,7 @@ IOP::TaggedProfile * PortableInterceptor::ClientRequestInfo::effective_profile (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -2119,7 +2125,7 @@ IOP::TaggedProfile * PortableInterceptor::ClientRequestInfo::effective_profile (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -2131,15 +2137,15 @@ CORBA::Any * PortableInterceptor::ClientRequestInfo::received_exception (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::Any *_tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, CORBA::Any, _tao_retval);
   CORBA::Any_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -2156,7 +2162,7 @@ CORBA::Any * PortableInterceptor::ClientRequestInfo::received_exception (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -2180,7 +2186,7 @@ CORBA::Any * PortableInterceptor::ClientRequestInfo::received_exception (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -2192,15 +2198,15 @@ char * PortableInterceptor::ClientRequestInfo::received_exception_id (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::String_var _tao_safe_retval;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_received_exception_id",
@@ -2214,7 +2220,7 @@ char * PortableInterceptor::ClientRequestInfo::received_exception_id (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -2238,7 +2244,7 @@ char * PortableInterceptor::ClientRequestInfo::received_exception_id (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -2251,14 +2257,14 @@ IOP::TaggedComponent * PortableInterceptor::ClientRequestInfo::get_effective_com
     CORBA::SystemException
   ))
 {
-
+  
   IOP::TaggedComponent *_tao_retval = 0;
-
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, IOP::TaggedComponent, _tao_retval);
   IOP::TaggedComponent_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -2275,7 +2281,7 @@ IOP::TaggedComponent * PortableInterceptor::ClientRequestInfo::get_effective_com
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -2305,7 +2311,7 @@ IOP::TaggedComponent * PortableInterceptor::ClientRequestInfo::get_effective_com
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -2318,16 +2324,16 @@ CORBA::Policy_ptr PortableInterceptor::ClientRequestInfo::get_request_policy (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil ();
   CORBA::Policy_var _tao_safe_retval (_tao_retval);
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "get_request_policy",
@@ -2341,7 +2347,7 @@ CORBA::Policy_ptr PortableInterceptor::ClientRequestInfo::get_request_policy (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -2371,7 +2377,7 @@ CORBA::Policy_ptr PortableInterceptor::ClientRequestInfo::get_request_policy (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -2385,15 +2391,15 @@ void PortableInterceptor::ClientRequestInfo::add_request_service_context (
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "add_request_service_context",
@@ -2407,7 +2413,7 @@ void PortableInterceptor::ClientRequestInfo::add_request_service_context (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -2429,9 +2435,9 @@ void PortableInterceptor::ClientRequestInfo::add_request_service_context (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -2469,7 +2475,7 @@ void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptr_arith_t t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2492,15 +2498,15 @@ const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (vo
   TAO_NAMESPACE_BEGIN (PortableInterceptor)
   TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ClientRequestInfo, &_tc_TAO_tc_PortableInterceptor_ClientRequestInfo)
   TAO_NAMESPACE_END
-
+    
   // default constructor
   PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
   {}
-
+  
   // destructor
   PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
   {}
-
+  
   void PortableInterceptor::ServerRequestInfo::_tao_any_destructor (void *x)
   {
     ServerRequestInfo *tmp = ACE_static_cast (ServerRequestInfo*,x);
@@ -2523,7 +2529,7 @@ const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (vo
       }
     return ServerRequestInfo::_unchecked_narrow (obj, ACE_TRY_ENV);
   }
-
+  
   PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
       CORBA::Object_ptr obj,
       CORBA::Environment &
@@ -2547,7 +2553,7 @@ const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (vo
           return default_proxy;
 
       }
-    else
+    else 
       return
         ACE_reinterpret_cast
           (
@@ -2578,15 +2584,15 @@ CORBA::Any * PortableInterceptor::ServerRequestInfo::sending_exception (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::Any *_tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, CORBA::Any, _tao_retval);
   CORBA::Any_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -2603,7 +2609,7 @@ CORBA::Any * PortableInterceptor::ServerRequestInfo::sending_exception (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -2627,7 +2633,7 @@ CORBA::Any * PortableInterceptor::ServerRequestInfo::sending_exception (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -2639,15 +2645,15 @@ PortableInterceptor::OctetSeq * PortableInterceptor::ServerRequestInfo::object_i
     CORBA::SystemException
   ))
 {
-
+  
   PortableInterceptor::OctetSeq *_tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, PortableInterceptor::OctetSeq, _tao_retval);
   PortableInterceptor::OctetSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -2663,7 +2669,7 @@ PortableInterceptor::OctetSeq * PortableInterceptor::ServerRequestInfo::object_i
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -2687,7 +2693,7 @@ PortableInterceptor::OctetSeq * PortableInterceptor::ServerRequestInfo::object_i
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -2699,15 +2705,15 @@ PortableInterceptor::OctetSeq * PortableInterceptor::ServerRequestInfo::adapter_
     CORBA::SystemException
   ))
 {
-
+  
   PortableInterceptor::OctetSeq *_tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, PortableInterceptor::OctetSeq, _tao_retval);
   PortableInterceptor::OctetSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -2724,7 +2730,7 @@ PortableInterceptor::OctetSeq * PortableInterceptor::ServerRequestInfo::adapter_
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -2748,7 +2754,7 @@ PortableInterceptor::OctetSeq * PortableInterceptor::ServerRequestInfo::adapter_
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -2760,15 +2766,15 @@ char * PortableInterceptor::ServerRequestInfo::target_most_derived_interface (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::String_var _tao_safe_retval;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_target_most_derived_interface",
@@ -2782,7 +2788,7 @@ char * PortableInterceptor::ServerRequestInfo::target_most_derived_interface (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -2806,7 +2812,7 @@ char * PortableInterceptor::ServerRequestInfo::target_most_derived_interface (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -2819,16 +2825,16 @@ CORBA::Policy_ptr PortableInterceptor::ServerRequestInfo::get_server_policy (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil ();
   CORBA::Policy_var _tao_safe_retval (_tao_retval);
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "get_server_policy",
@@ -2843,7 +2849,7 @@ CORBA::Policy_ptr PortableInterceptor::ServerRequestInfo::get_server_policy (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -2873,7 +2879,7 @@ CORBA::Policy_ptr PortableInterceptor::ServerRequestInfo::get_server_policy (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -2888,20 +2894,20 @@ void PortableInterceptor::ServerRequestInfo::set_slot (
     PortableInterceptor::InvalidSlot
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_ServerRequestInfo_set_slot_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_ServerRequestInfo_set_slot_exceptiondata [] = 
   {
     {PortableInterceptor::_tc_InvalidSlot, PortableInterceptor::InvalidSlot::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "set_slot",
@@ -2916,7 +2922,7 @@ void PortableInterceptor::ServerRequestInfo::set_slot (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -2938,9 +2944,9 @@ void PortableInterceptor::ServerRequestInfo::set_slot (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -2953,15 +2959,15 @@ CORBA::Boolean PortableInterceptor::ServerRequestInfo::target_is_a (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::Boolean _tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "target_is_a",
@@ -2976,7 +2982,7 @@ CORBA::Boolean PortableInterceptor::ServerRequestInfo::target_is_a (
       ACE_CHECK_RETURN  (_tao_retval);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -3006,7 +3012,7 @@ CORBA::Boolean PortableInterceptor::ServerRequestInfo::target_is_a (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
 
     break;
-
+    
   }
 return _tao_retval;
 }
@@ -3020,15 +3026,15 @@ void PortableInterceptor::ServerRequestInfo::add_reply_service_context (
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "add_reply_service_context",
@@ -3042,7 +3048,7 @@ void PortableInterceptor::ServerRequestInfo::add_reply_service_context (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -3064,9 +3070,9 @@ void PortableInterceptor::ServerRequestInfo::add_reply_service_context (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -3104,7 +3110,7 @@ void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptr_arith_t t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -3127,15 +3133,15 @@ const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (vo
   TAO_NAMESPACE_BEGIN (PortableInterceptor)
   TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerRequestInfo, &_tc_TAO_tc_PortableInterceptor_ServerRequestInfo)
   TAO_NAMESPACE_END
-
+    
   // default constructor
   PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
   {}
-
+  
   // destructor
   PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void)
   {}
-
+  
   void PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor (void *x)
   {
     ClientRequestInterceptor *tmp = ACE_static_cast (ClientRequestInterceptor*,x);
@@ -3158,7 +3164,7 @@ const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (vo
       }
     return ClientRequestInterceptor::_unchecked_narrow (obj, ACE_TRY_ENV);
   }
-
+  
   PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
       CORBA::Object_ptr obj,
       CORBA::Environment &
@@ -3182,7 +3188,7 @@ const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (vo
           return default_proxy;
 
       }
-    else
+    else 
       return
         ACE_reinterpret_cast
           (
@@ -3215,20 +3221,20 @@ void PortableInterceptor::ClientRequestInterceptor::send_request (
     PortableInterceptor::ForwardRequest
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_ClientRequestInterceptor_send_request_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_ClientRequestInterceptor_send_request_exceptiondata [] = 
   {
     {PortableInterceptor::_tc_ForwardRequest, PortableInterceptor::ForwardRequest::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "send_request",
@@ -3242,7 +3248,7 @@ void PortableInterceptor::ClientRequestInterceptor::send_request (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -3263,9 +3269,9 @@ void PortableInterceptor::ClientRequestInterceptor::send_request (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -3278,15 +3284,15 @@ void PortableInterceptor::ClientRequestInterceptor::send_poll (
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "send_poll",
@@ -3301,7 +3307,7 @@ void PortableInterceptor::ClientRequestInterceptor::send_poll (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -3322,9 +3328,9 @@ void PortableInterceptor::ClientRequestInterceptor::send_poll (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -3337,15 +3343,15 @@ void PortableInterceptor::ClientRequestInterceptor::receive_reply (
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "receive_reply",
@@ -3360,7 +3366,7 @@ void PortableInterceptor::ClientRequestInterceptor::receive_reply (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -3381,9 +3387,9 @@ void PortableInterceptor::ClientRequestInterceptor::receive_reply (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -3397,20 +3403,20 @@ void PortableInterceptor::ClientRequestInterceptor::receive_exception (
     PortableInterceptor::ForwardRequest
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_ClientRequestInterceptor_receive_exception_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_ClientRequestInterceptor_receive_exception_exceptiondata [] = 
   {
     {PortableInterceptor::_tc_ForwardRequest, PortableInterceptor::ForwardRequest::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "receive_exception",
@@ -3425,7 +3431,7 @@ void PortableInterceptor::ClientRequestInterceptor::receive_exception (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -3446,9 +3452,9 @@ void PortableInterceptor::ClientRequestInterceptor::receive_exception (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -3462,20 +3468,20 @@ void PortableInterceptor::ClientRequestInterceptor::receive_other (
     PortableInterceptor::ForwardRequest
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_ClientRequestInterceptor_receive_other_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_ClientRequestInterceptor_receive_other_exceptiondata [] = 
   {
     {PortableInterceptor::_tc_ForwardRequest, PortableInterceptor::ForwardRequest::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "receive_other",
@@ -3490,7 +3496,7 @@ void PortableInterceptor::ClientRequestInterceptor::receive_other (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -3511,9 +3517,9 @@ void PortableInterceptor::ClientRequestInterceptor::receive_other (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -3551,7 +3557,7 @@ void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptr_ar
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -3629,7 +3635,7 @@ PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerReq
         return default_proxy;
 
     }
-  else
+  else 
     return
       ACE_reinterpret_cast
         (
@@ -3662,20 +3668,20 @@ void PortableInterceptor::ServerRequestInterceptor::receive_request_service_cont
     PortableInterceptor::ForwardRequest
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_ServerRequestInterceptor_receive_request_service_contexts_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_ServerRequestInterceptor_receive_request_service_contexts_exceptiondata [] = 
   {
     {PortableInterceptor::_tc_ForwardRequest, PortableInterceptor::ForwardRequest::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "receive_request_service_contexts",
@@ -3690,7 +3696,7 @@ void PortableInterceptor::ServerRequestInterceptor::receive_request_service_cont
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -3711,9 +3717,9 @@ void PortableInterceptor::ServerRequestInterceptor::receive_request_service_cont
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -3727,20 +3733,20 @@ void PortableInterceptor::ServerRequestInterceptor::receive_request (
     PortableInterceptor::ForwardRequest
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_ServerRequestInterceptor_receive_request_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_ServerRequestInterceptor_receive_request_exceptiondata [] = 
   {
     {PortableInterceptor::_tc_ForwardRequest, PortableInterceptor::ForwardRequest::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "receive_request",
@@ -3755,7 +3761,7 @@ void PortableInterceptor::ServerRequestInterceptor::receive_request (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -3776,9 +3782,9 @@ void PortableInterceptor::ServerRequestInterceptor::receive_request (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -3791,15 +3797,15 @@ void PortableInterceptor::ServerRequestInterceptor::send_reply (
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "send_reply",
@@ -3814,7 +3820,7 @@ void PortableInterceptor::ServerRequestInterceptor::send_reply (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -3835,9 +3841,9 @@ void PortableInterceptor::ServerRequestInterceptor::send_reply (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -3851,20 +3857,20 @@ void PortableInterceptor::ServerRequestInterceptor::send_exception (
     PortableInterceptor::ForwardRequest
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_ServerRequestInterceptor_send_exception_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_ServerRequestInterceptor_send_exception_exceptiondata [] = 
   {
     {PortableInterceptor::_tc_ForwardRequest, PortableInterceptor::ForwardRequest::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "send_exception",
@@ -3879,7 +3885,7 @@ void PortableInterceptor::ServerRequestInterceptor::send_exception (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -3900,9 +3906,9 @@ void PortableInterceptor::ServerRequestInterceptor::send_exception (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -3916,20 +3922,20 @@ void PortableInterceptor::ServerRequestInterceptor::send_other (
     PortableInterceptor::ForwardRequest
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_ServerRequestInterceptor_send_other_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_ServerRequestInterceptor_send_other_exceptiondata [] = 
   {
     {PortableInterceptor::_tc_ForwardRequest, PortableInterceptor::ForwardRequest::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "send_other",
@@ -3944,7 +3950,7 @@ void PortableInterceptor::ServerRequestInterceptor::send_other (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -3965,9 +3971,9 @@ void PortableInterceptor::ServerRequestInterceptor::send_other (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -4005,7 +4011,7 @@ void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptr_ar
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -4083,7 +4089,7 @@ PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_unchecked_narrow
         return default_proxy;
 
     }
-  else
+  else 
     return
       ACE_reinterpret_cast
         (
@@ -4115,16 +4121,16 @@ CORBA::Policy_ptr PortableInterceptor::IORInfo::get_effective_policy (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil ();
   CORBA::Policy_var _tao_safe_retval (_tao_retval);
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "get_effective_policy",
@@ -4139,7 +4145,7 @@ CORBA::Policy_ptr PortableInterceptor::IORInfo::get_effective_policy (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -4169,7 +4175,7 @@ CORBA::Policy_ptr PortableInterceptor::IORInfo::get_effective_policy (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -4182,15 +4188,15 @@ void PortableInterceptor::IORInfo::add_ior_component (
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "add_ior_component",
@@ -4205,7 +4211,7 @@ void PortableInterceptor::IORInfo::add_ior_component (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -4226,9 +4232,9 @@ void PortableInterceptor::IORInfo::add_ior_component (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -4242,15 +4248,15 @@ void PortableInterceptor::IORInfo::add_ior_component_to_profile (
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "add_ior_component_to_profile",
@@ -4265,7 +4271,7 @@ void PortableInterceptor::IORInfo::add_ior_component_to_profile (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -4287,9 +4293,9 @@ void PortableInterceptor::IORInfo::add_ior_component_to_profile (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -4314,7 +4320,7 @@ void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -4337,15 +4343,15 @@ const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const
   TAO_NAMESPACE_BEGIN (PortableInterceptor)
   TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IORInfo, &_tc_TAO_tc_PortableInterceptor_IORInfo)
   TAO_NAMESPACE_END
-
+    
   // default constructor
   PortableInterceptor::IORInterceptor::IORInterceptor (void)
   {}
-
+  
   // destructor
   PortableInterceptor::IORInterceptor::~IORInterceptor (void)
   {}
-
+  
   void PortableInterceptor::IORInterceptor::_tao_any_destructor (void *x)
   {
     IORInterceptor *tmp = ACE_static_cast (IORInterceptor*,x);
@@ -4368,7 +4374,7 @@ const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const
       }
     return IORInterceptor::_unchecked_narrow (obj, ACE_TRY_ENV);
   }
-
+  
   PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_unchecked_narrow (
       CORBA::Object_ptr obj,
       CORBA::Environment &
@@ -4391,7 +4397,7 @@ const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const
           ACE_NEW_RETURN (default_proxy, ::PortableInterceptor::IORInterceptor (stub), IORInterceptor::_nil ());
           return default_proxy;
       }
-    else
+    else 
       return
         ACE_reinterpret_cast
           (
@@ -4423,15 +4429,15 @@ void PortableInterceptor::IORInterceptor::establish_components (
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "establish_components",
@@ -4446,7 +4452,7 @@ void PortableInterceptor::IORInterceptor::establish_components (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -4467,9 +4473,9 @@ void PortableInterceptor::IORInterceptor::establish_components (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -4507,7 +4513,7 @@ void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptr_arith_t type
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -4585,7 +4591,7 @@ PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_unch
         return default_proxy;
 
     }
-  else
+  else 
     return
       ACE_reinterpret_cast
         (
@@ -4619,21 +4625,21 @@ CORBA::Policy_ptr PortableInterceptor::PolicyFactory::create_policy (
     CORBA::PolicyError
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_PolicyFactory_create_policy_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_PolicyFactory_create_policy_exceptiondata [] = 
   {
     {CORBA::_tc_PolicyError, CORBA::PolicyError::_alloc}
   };
 
   CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil ();
   CORBA::Policy_var _tao_safe_retval (_tao_retval);
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_policy",
@@ -4648,7 +4654,7 @@ CORBA::Policy_ptr PortableInterceptor::PolicyFactory::create_policy (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -4679,7 +4685,7 @@ CORBA::Policy_ptr PortableInterceptor::PolicyFactory::create_policy (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -4704,7 +4710,7 @@ void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -4782,7 +4788,7 @@ PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_unchecke
         return default_proxy;
 
     }
-  else
+  else 
     return
       ACE_reinterpret_cast
         (
@@ -4811,7 +4817,7 @@ static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_ObjectId[] =
   TAO_ENCAP_BYTE_ORDER, // byte order
   49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72636570), ACE_NTOHL (0x746f722f), ACE_NTOHL (0x4f524249), ACE_NTOHL (0x6e697449), ACE_NTOHL (0x6e666f2f), ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:PortableInterceptor/ORBInitInfo/ObjectId:1.0
   9, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x0),  // name = ObjectId
-  CORBA::tk_string,
+  CORBA::tk_string, 
   0U, // string length
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId (CORBA::tk_alias, sizeof (_oc_PortableInterceptor_ORBInitInfo_ObjectId), (char *) &_oc_PortableInterceptor_ORBInitInfo_ObjectId, 0, sizeof (PortableInterceptor::ORBInitInfo::ObjectId));
@@ -4912,7 +4918,7 @@ static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_DuplicateName[] =
   14, ACE_NTOHL (0x4475706c), ACE_NTOHL (0x69636174), ACE_NTOHL (0x654e616d), ACE_NTOHL (0x65000000),  // name = DuplicateName
   1, // member count
   5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_string,
+  CORBA::tk_string, 
   0U, // string length
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName (CORBA::tk_except, sizeof (_oc_PortableInterceptor_ORBInitInfo_DuplicateName), (char *) &_oc_PortableInterceptor_ORBInitInfo_DuplicateName, 0, sizeof (PortableInterceptor::ORBInitInfo::DuplicateName));
@@ -5027,15 +5033,15 @@ PortableInterceptor::StringSeq * PortableInterceptor::ORBInitInfo::arguments (
     CORBA::SystemException
   ))
 {
-
+  
   PortableInterceptor::StringSeq *_tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   ACE_NEW_RETURN (_tao_retval, PortableInterceptor::StringSeq, _tao_retval);
   PortableInterceptor::StringSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -5052,7 +5058,7 @@ PortableInterceptor::StringSeq * PortableInterceptor::ORBInitInfo::arguments (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -5076,7 +5082,7 @@ PortableInterceptor::StringSeq * PortableInterceptor::ORBInitInfo::arguments (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -5088,15 +5094,15 @@ char * PortableInterceptor::ORBInitInfo::orb_id (
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::String_var _tao_safe_retval;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_orb_id",
@@ -5111,7 +5117,7 @@ char * PortableInterceptor::ORBInitInfo::orb_id (
       ACE_CHECK_RETURN (0);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -5135,7 +5141,7 @@ char * PortableInterceptor::ORBInitInfo::orb_id (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
 
     break;
-
+    
   }
 return _tao_safe_retval._retn ();
 }
@@ -5150,20 +5156,20 @@ void PortableInterceptor::ORBInitInfo::register_initial_reference (
     PortableInterceptor::ORBInitInfo::InvalidName
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_ORBInitInfo_register_initial_reference_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_ORBInitInfo_register_initial_reference_exceptiondata [] = 
   {
     {PortableInterceptor::ORBInitInfo::_tc_InvalidName, PortableInterceptor::ORBInitInfo::InvalidName::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "register_initial_reference",
@@ -5178,7 +5184,7 @@ void PortableInterceptor::ORBInitInfo::register_initial_reference (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -5200,9 +5206,9 @@ void PortableInterceptor::ORBInitInfo::register_initial_reference (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -5216,20 +5222,20 @@ void PortableInterceptor::ORBInitInfo::resolve_initial_references (
     PortableInterceptor::ORBInitInfo::InvalidName
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_ORBInitInfo_resolve_initial_references_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_ORBInitInfo_resolve_initial_references_exceptiondata [] = 
   {
     {PortableInterceptor::ORBInitInfo::_tc_InvalidName, PortableInterceptor::ORBInitInfo::InvalidName::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "resolve_initial_references",
@@ -5244,7 +5250,7 @@ void PortableInterceptor::ORBInitInfo::resolve_initial_references (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -5265,9 +5271,9 @@ void PortableInterceptor::ORBInitInfo::resolve_initial_references (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -5281,20 +5287,20 @@ void PortableInterceptor::ORBInitInfo::add_client_request_interceptor (
     PortableInterceptor::ORBInitInfo::DuplicateName
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_ORBInitInfo_add_client_request_interceptor_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_ORBInitInfo_add_client_request_interceptor_exceptiondata [] = 
   {
     {PortableInterceptor::ORBInitInfo::_tc_DuplicateName, PortableInterceptor::ORBInitInfo::DuplicateName::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "add_client_request_interceptor",
@@ -5309,7 +5315,7 @@ void PortableInterceptor::ORBInitInfo::add_client_request_interceptor (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -5330,9 +5336,9 @@ void PortableInterceptor::ORBInitInfo::add_client_request_interceptor (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -5346,20 +5352,20 @@ void PortableInterceptor::ORBInitInfo::add_server_request_interceptor (
     PortableInterceptor::ORBInitInfo::DuplicateName
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_ORBInitInfo_add_server_request_interceptor_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_ORBInitInfo_add_server_request_interceptor_exceptiondata [] = 
   {
     {PortableInterceptor::ORBInitInfo::_tc_DuplicateName, PortableInterceptor::ORBInitInfo::DuplicateName::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "add_server_request_interceptor",
@@ -5374,7 +5380,7 @@ void PortableInterceptor::ORBInitInfo::add_server_request_interceptor (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -5396,7 +5402,7 @@ void PortableInterceptor::ORBInitInfo::add_server_request_interceptor (
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
       break;
-
+      
     }
 
 }
@@ -5410,20 +5416,20 @@ void PortableInterceptor::ORBInitInfo::add_ior_interceptor (
     PortableInterceptor::ORBInitInfo::DuplicateName
   ))
 {
-
-  static TAO_Exception_Data _tao_PortableInterceptor_ORBInitInfo_add_ior_interceptor_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_PortableInterceptor_ORBInitInfo_add_ior_interceptor_exceptiondata [] = 
   {
     {PortableInterceptor::ORBInitInfo::_tc_DuplicateName, PortableInterceptor::ORBInitInfo::DuplicateName::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "add_ior_interceptor",
@@ -5438,7 +5444,7 @@ void PortableInterceptor::ORBInitInfo::add_ior_interceptor (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -5459,9 +5465,9 @@ void PortableInterceptor::ORBInitInfo::add_ior_interceptor (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -5473,15 +5479,15 @@ PortableInterceptor::SlotId PortableInterceptor::ORBInitInfo::allocate_slot_id (
     CORBA::SystemException
   ))
 {
-
+  
   PortableInterceptor::SlotId _tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "allocate_slot_id",
@@ -5496,7 +5502,7 @@ PortableInterceptor::SlotId PortableInterceptor::ORBInitInfo::allocate_slot_id (
       ACE_CHECK_RETURN  (_tao_retval);
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -5520,7 +5526,7 @@ PortableInterceptor::SlotId PortableInterceptor::ORBInitInfo::allocate_slot_id (
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
 
     break;
-
+    
   }
 return _tao_retval;
 }
@@ -5534,15 +5540,15 @@ void PortableInterceptor::ORBInitInfo::register_policy_factory (
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "register_policy_factory",
@@ -5557,7 +5563,7 @@ void PortableInterceptor::ORBInitInfo::register_policy_factory (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -5579,9 +5585,9 @@ void PortableInterceptor::ORBInitInfo::register_policy_factory (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -5606,7 +5612,7 @@ void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -5629,15 +5635,15 @@ const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) co
   TAO_NAMESPACE_BEGIN (PortableInterceptor)
   TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ORBInitInfo, &_tc_TAO_tc_PortableInterceptor_ORBInitInfo)
   TAO_NAMESPACE_END
-
+    
   // default constructor
   PortableInterceptor::ORBInitializer::ORBInitializer (void)
   {}
-
+  
   // destructor
   PortableInterceptor::ORBInitializer::~ORBInitializer (void)
   {}
-
+  
   void PortableInterceptor::ORBInitializer::_tao_any_destructor (void *x)
   {
     ORBInitializer *tmp = ACE_static_cast (ORBInitializer*,x);
@@ -5660,7 +5666,7 @@ const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) co
       }
     return ORBInitializer::_unchecked_narrow (obj, ACE_TRY_ENV);
   }
-
+  
   PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_unchecked_narrow (
       CORBA::Object_ptr obj,
       CORBA::Environment &
@@ -5684,7 +5690,7 @@ const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) co
           return default_proxy;
 
       }
-    else
+    else 
       return
         ACE_reinterpret_cast
           (
@@ -5716,15 +5722,15 @@ void PortableInterceptor::ORBInitializer::pre_init (
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "pre_init",
@@ -5739,7 +5745,7 @@ void PortableInterceptor::ORBInitializer::pre_init (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -5760,9 +5766,9 @@ void PortableInterceptor::ORBInitializer::pre_init (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -5775,15 +5781,15 @@ void PortableInterceptor::ORBInitializer::post_init (
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "post_init",
@@ -5798,7 +5804,7 @@ void PortableInterceptor::ORBInitializer::post_init (
       ACE_CHECK;
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-
+      
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
         );
@@ -5819,9 +5825,9 @@ void PortableInterceptor::ORBInitializer::post_init (
       {
         ACE_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
       }
-
+      
       break;
-
+      
     }
 
 }
@@ -5846,7 +5852,7 @@ void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptr_arith_t type
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -6056,7 +6062,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::Interceptor_ptr _ta
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        PortableInterceptor::_tc_Interceptor,
+        PortableInterceptor::_tc_Interceptor, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -6294,7 +6300,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::Current_ptr _tao_el
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        PortableInterceptor::_tc_Current,
+        PortableInterceptor::_tc_Current, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -6356,7 +6362,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::RequestInfo_ptr _ta
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        PortableInterceptor::_tc_RequestInfo,
+        PortableInterceptor::_tc_RequestInfo, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -6418,7 +6424,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::ClientRequestInfo_p
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        PortableInterceptor::_tc_ClientRequestInfo,
+        PortableInterceptor::_tc_ClientRequestInfo, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -6480,7 +6486,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::ServerRequestInfo_p
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        PortableInterceptor::_tc_ServerRequestInfo,
+        PortableInterceptor::_tc_ServerRequestInfo, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -6542,7 +6548,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::ClientRequestInterc
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        PortableInterceptor::_tc_ClientRequestInterceptor,
+        PortableInterceptor::_tc_ClientRequestInterceptor, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -6604,7 +6610,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::ServerRequestInterc
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        PortableInterceptor::_tc_ServerRequestInterceptor,
+        PortableInterceptor::_tc_ServerRequestInterceptor, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -6666,7 +6672,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::IORInfo_ptr _tao_el
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        PortableInterceptor::_tc_IORInfo,
+        PortableInterceptor::_tc_IORInfo, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -6728,7 +6734,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::IORInterceptor_ptr
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        PortableInterceptor::_tc_IORInterceptor,
+        PortableInterceptor::_tc_IORInterceptor, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -6790,7 +6796,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::PolicyFactory_ptr _
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        PortableInterceptor::_tc_PolicyFactory,
+        PortableInterceptor::_tc_PolicyFactory, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -6852,7 +6858,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::ORBInitInfo_ptr _ta
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        PortableInterceptor::_tc_ORBInitInfo,
+        PortableInterceptor::_tc_ORBInitInfo, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -7090,7 +7096,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::ORBInitializer_ptr
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        PortableInterceptor::_tc_ORBInitializer,
+        PortableInterceptor::_tc_ORBInitializer, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -7151,20 +7157,20 @@ CORBA::Boolean operator<< (
   if (strm << _tao_sequence.length ())
   {
     // encode all elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
         ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (PortableInterceptor::OctetSeq *)&_tao_sequence);
       if (oseq->mb ())
         return strm.write_octet_array_mb (oseq->mb ());
       else
         return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -7181,14 +7187,14 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
         ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
       oseq->replace (_tao_seq_len, strm.start ());
       oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
@@ -7197,10 +7203,10 @@ CORBA::Boolean operator>> (
     }
     else
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -7235,7 +7241,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index c9b375ea2d9..ebb02c1b868 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -772,12 +772,18 @@ public:
       CORBA::SystemException
     ));
 
-  virtual Dynamic::ParameterList * arguments (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual Dynamic::ParameterList * arguments (
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual Dynamic::ExceptionList * exceptions (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual Dynamic::ExceptionList * exceptions (
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
@@ -798,7 +804,10 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::Any * result (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Any * result (
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
diff --git a/TAO/tao/PortableServer/DomainS.cpp b/TAO/tao/PortableServer/DomainS.cpp
index 3aede14b067..600df8d06db 100644
--- a/TAO/tao/PortableServer/DomainS.cpp
+++ b/TAO/tao/PortableServer/DomainS.cpp
@@ -544,7 +544,7 @@ CORBA::Environment &)
 {}
 
 Dynamic::ParameterList *
-POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::arguments (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::arguments (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
    // Generate the arg list on demand
@@ -558,17 +558,17 @@ POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_p
     return &this->parameter_list_;
 }
 
-Dynamic::ExceptionList *
-POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::exceptions (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
+  Dynamic::ExceptionList *
+  POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::exceptions (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
  // Generate the exception list on demand
-    return 0;
+  return 0;
 }
 
 
-CORBA::Any *
-POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::result (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Any *
+POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::result (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
  // Generate the result on demand
@@ -1031,43 +1031,43 @@ CORBA::Environment &)
 {}
 
 Dynamic::ParameterList *
-POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::arguments (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::arguments (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // Generate the arg list on demand
+   // Generate the arg list on demand
   CORBA::ULong length = 0;
-  length = this->parameter_list_.length ();
-  this->parameter_list_.length (length + 1);
-  this->parameter_list_[length].argument <<=  this->object_type_;
+        length = this->parameter_list_.length ();
+      this->parameter_list_.length (length + 1);
+      this->parameter_list_[length].argument <<=  this->object_type_;
 
-  this->parameter_list_[length].mode = Dynamic::PARAM_IN;
-  length = this->parameter_list_.length ();
-  this->parameter_list_.length (length + 1);
-  this->parameter_list_[length].argument <<= CORBA::Any::from_boolean (this->constr_policy_ );
-  this->parameter_list_[length].mode = Dynamic::PARAM_IN;
+    this->parameter_list_[length].mode = Dynamic::PARAM_IN;
+                length = this->parameter_list_.length ();
+        this->parameter_list_.length (length + 1);
+        this->parameter_list_[length].argument <<= CORBA::Any::from_boolean (this->constr_policy_ );
+      this->parameter_list_[length].mode = Dynamic::PARAM_IN;
 
-  return &this->parameter_list_;
+      return &this->parameter_list_;
 }
 
-Dynamic::ExceptionList *
-POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::exceptions (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand
-  return 0;
+    Dynamic::ExceptionList *
+    POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::exceptions (CORBA::Environment &)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+ // Generate the exception list on demand
+    return 0;
 }
 
 
-CORBA::Any *
-POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::result (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand
-  CORBA::TypeCode tc (CORBA::tk_void);
+      CORBA::Any *
+  POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::result (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+ // Generate the result on demand
+   CORBA::TypeCode tc (CORBA::tk_void);
   this->result_val_.type (&tc);
 
   return &this->result_val_;
-}
+  }
 
 #endif /* TAO_HAS_INTERCEPTORS && TAO_HAS_INTERFACE_REPOSITORY */
 
diff --git a/TAO/tao/PortableServer/DomainS.h b/TAO/tao/PortableServer/DomainS.h
index 827ece91572..b16a737062b 100644
--- a/TAO/tao/PortableServer/DomainS.h
+++ b/TAO/tao/PortableServer/DomainS.h
@@ -116,14 +116,20 @@
         TAO_default_environment ()
       );
 
-      virtual Dynamic::ParameterList * arguments (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+       virtual Dynamic::ParameterList * arguments (
+        CORBA::Environment &ACE_TRY_ENV =
+           TAO_default_environment ())
+       ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual Dynamic::ExceptionList * exceptions (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+        virtual Dynamic::ExceptionList * exceptions (
+      CORBA::Environment &ACE_TRY_ENV =
+         TAO_default_environment ())
+     ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Any * result (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Any * result (
+    CORBA::Environment &ACE_TRY_ENV =
+       TAO_default_environment ())
+   ACE_THROW_SPEC ((CORBA::SystemException));
 
 
 private:
@@ -381,14 +387,20 @@ public:
       TAO_default_environment ()
     );
 
-    virtual Dynamic::ParameterList * arguments (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+     virtual Dynamic::ParameterList * arguments (
+      CORBA::Environment &ACE_TRY_ENV =
+         TAO_default_environment ())
+     ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual Dynamic::ExceptionList * exceptions (
+    CORBA::Environment &ACE_TRY_ENV =
+       TAO_default_environment ())
+   ACE_THROW_SPEC ((CORBA::SystemException));
+
+virtual CORBA::Any * result (
+  CORBA::Environment &ACE_TRY_ENV =
+     TAO_default_environment ())
+ ACE_THROW_SPEC ((CORBA::SystemException));
 
 
 private:
diff --git a/TAO/tao/Request_Info.cpp b/TAO/tao/Request_Info.cpp
index c821c81188f..072e4a4db43 100644
--- a/TAO/tao/Request_Info.cpp
+++ b/TAO/tao/Request_Info.cpp
@@ -24,16 +24,16 @@
 ACE_RCSID(tao, request_info, "$Id$")
 #if (TAO_HAS_INTERCEPTORS == 1)
 TAO_ClientRequest_Info::TAO_ClientRequest_Info (const char * operation,
-                                                IOP::ServiceContextList &service_context_list ,
+                                                IOP::ServiceContextList &service_context_list ,               
                                                 CORBA::Object * target,
                                                 CORBA::Environment &)
-  : operation_ (operation),
+  : operation_ (operation), 
     service_context_list_ (service_context_list),
     target_ (CORBA_Object::_duplicate (target))
 {
 }
 
-CORBA::Object_ptr
+CORBA::Object_ptr 
 TAO_ClientRequest_Info::target (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -46,7 +46,7 @@ CORBA::Object_ptr  TAO_ClientRequest_Info::effective_target (CORBA::Environment
  return 0;
 }
 
-IOP::TaggedProfile *
+IOP::TaggedProfile *  
 TAO_ClientRequest_Info::effective_profile (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -54,9 +54,9 @@ TAO_ClientRequest_Info::effective_profile (CORBA::Environment &)
 }
 
 // Use at own risk. There is no way currently of extracting an
-// exception from an Any. This method is in place just to be compliant
+// exception from an Any. This method is in place just to be compliant 
 // with the spec.
-CORBA::Any *
+CORBA::Any *  
 TAO_ClientRequest_Info::received_exception (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -67,33 +67,33 @@ TAO_ClientRequest_Info::received_exception (CORBA::Environment &)
 }
 
 // = TAO specific method done since there currently is no simple way
-// to extract exceptions from an Any
-CORBA::Exception *
+// to extract exceptions from an Any 
+CORBA::Exception *  
 TAO_ClientRequest_Info::_received_exception (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->caught_exception_;
 }
-
-char *
+  
+char *  
 TAO_ClientRequest_Info::received_exception_id (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // constness had to be casted since <_id> which is a TAO-specific
   // extension of CORBA::Exception returns a const char *.
-  return ACE_const_cast (char *,
+  return ACE_const_cast (char *, 
                          this->caught_exception_->_id ());
 }
 
-IOP::TaggedComponent *
+IOP::TaggedComponent *  
 TAO_ClientRequest_Info::get_effective_component (IOP::ComponentId,
                                                  CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
-
-CORBA::Policy_ptr
+ 
+CORBA::Policy_ptr  
 TAO_ClientRequest_Info::get_request_policy (CORBA::PolicyType,
                                             CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -101,11 +101,11 @@ TAO_ClientRequest_Info::get_request_policy (CORBA::PolicyType,
   return 0;
 }
 
-void
+void  
 TAO_ClientRequest_Info::add_request_service_context (const IOP::ServiceContext & service_context,
                                                      CORBA::Boolean,
                                                      CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException)) 
 {
   // Copy the service context into the list.
   CORBA::ULong length = this->service_context_list_.length ();
@@ -114,114 +114,114 @@ TAO_ClientRequest_Info::add_request_service_context (const IOP::ServiceContext &
   service_context_list_[length] = service_context;
 }
 
-CORBA::ULong
+CORBA::ULong 
 TAO_ClientRequest_Info::request_id (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_id_;
 }
 
-char *
+char * 
 TAO_ClientRequest_Info::operation (CORBA::Environment &)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return ACE_const_cast (char *,
+  return ACE_const_cast (char *, 
                          this->operation_);
 
 }
 
-Dynamic::ParameterList *
-TAO_ClientRequest_Info::arguments (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Dynamic::ParameterList * 
+TAO_ClientRequest_Info::arguments (CORBA::Environment &)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
  return &this->parameter_list_;
 }
 
-Dynamic::ExceptionList *
-TAO_ClientRequest_Info::exceptions (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Dynamic::ExceptionList * 
+TAO_ClientRequest_Info::exceptions (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return &this->exception_list_;
 }
 
-Dynamic::ContextList *
-TAO_ClientRequest_Info::contexts (CORBA::Environment &)
+Dynamic::ContextList * 
+TAO_ClientRequest_Info::contexts (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
  return &this->context_list_;
 }
 
-Dynamic::RequestContext *
-TAO_ClientRequest_Info::operation_context (CORBA::Environment &)
+Dynamic::RequestContext * 
+TAO_ClientRequest_Info::operation_context (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
  return &this->request_context_;
 }
 
-CORBA::Any *
-TAO_ClientRequest_Info::result (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Any * 
+TAO_ClientRequest_Info::result (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
-CORBA::Boolean
-TAO_ClientRequest_Info::response_expected (CORBA::Environment &)
+CORBA::Boolean 
+TAO_ClientRequest_Info::response_expected (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
 # if (TAO_HAS_CORBA_MESSAGING == 1)
-Messaging::SyncScope
-TAO_ClientRequest_Info::sync_scope (CORBA::Environment &)
+Messaging::SyncScope 
+TAO_ClientRequest_Info::sync_scope (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
  return 0;
 }
 #endif  /* TAO_HAS_CORBA_MESSAGING */
 
-PortableInterceptor::ReplyStatus
-TAO_ClientRequest_Info::reply_status (CORBA::Environment &)
+PortableInterceptor::ReplyStatus 
+TAO_ClientRequest_Info::reply_status (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
-CORBA::Object_ptr
-TAO_ClientRequest_Info::forward_reference (CORBA::Environment &)
+CORBA::Object_ptr 
+TAO_ClientRequest_Info::forward_reference (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequest_Info::get_slot (PortableInterceptor::SlotId,
-                                  CORBA::Environment &)
+                                  CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
   return 0;
 }
 
-IOP::ServiceContext *
+IOP::ServiceContext * 
 TAO_ClientRequest_Info::get_request_service_context (IOP::ServiceId id,
-                                                     CORBA::Environment &)
+                                                     CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong size = 0; size < this->service_context_list_.length (); ++size)
     if (this->service_context_list_[size].context_id == id)
       {
          return &(this->service_context_list_[size]);
-
+        
       }
 return 0;
 }
 
-IOP::ServiceContext *
+IOP::ServiceContext * 
 TAO_ClientRequest_Info::get_reply_service_context (IOP::ServiceId id,
-                            CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+                            CORBA::Environment &)  
+  ACE_THROW_SPEC ((CORBA::SystemException)) 
 {
   for (CORBA::ULong size = 0; size < this->service_context_list_.length (); ++size)
     if (this->service_context_list_[size].context_id == id)
@@ -229,7 +229,7 @@ TAO_ClientRequest_Info::get_reply_service_context (IOP::ServiceId id,
         //Will it will get safely destroyed at the
         // TAO_Client side when the service context gets back.
         return &this->service_context_list_[size];
-
+        
       }
 return 0;
 }
@@ -246,109 +246,109 @@ TAO_ClientRequest_Info::request_id (CORBA::ULong request_id)
   this->request_id_ = request_id;
 }
 
-//****************************************************************
+//**************************************************************** 
 
 TAO_ServerRequest_Info::TAO_ServerRequest_Info (const char * operation,
-                                        IOP::ServiceContextList &service_context_list ,
+                                        IOP::ServiceContextList &service_context_list ,               
                                         CORBA::Environment &)
-  : operation_ (operation),
+  : operation_ (operation), 
     service_context_list_ (service_context_list)
 {
 }
 
 
-CORBA::ULong
+CORBA::ULong 
 TAO_ServerRequest_Info::request_id (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_id_;
 }
 
-char *
+char * 
 TAO_ServerRequest_Info::operation (CORBA::Environment &)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return ACE_const_cast (char *,
+  return ACE_const_cast (char *, 
                          this->operation_);
 }
 
-Dynamic::ParameterList *
-TAO_ServerRequest_Info::arguments (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Dynamic::ParameterList * 
+TAO_ServerRequest_Info::arguments (CORBA::Environment &)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
  return &this->parameter_list_;
 }
 
-Dynamic::ExceptionList *
-TAO_ServerRequest_Info::exceptions (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Dynamic::ExceptionList * 
+TAO_ServerRequest_Info::exceptions (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return &this->exception_list_;
 }
 
-Dynamic::ContextList *
-TAO_ServerRequest_Info::contexts (CORBA::Environment &)
+Dynamic::ContextList * 
+TAO_ServerRequest_Info::contexts (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
  return &this->context_list_;
 }
 
-Dynamic::RequestContext *
-TAO_ServerRequest_Info::operation_context (CORBA::Environment &)
+Dynamic::RequestContext * 
+TAO_ServerRequest_Info::operation_context (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
  return &this->request_context_;
 }
 
-CORBA::Any *
-TAO_ServerRequest_Info::result (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Any * 
+TAO_ServerRequest_Info::result (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
-CORBA::Boolean
-TAO_ServerRequest_Info::response_expected (CORBA::Environment &)
+CORBA::Boolean 
+TAO_ServerRequest_Info::response_expected (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 # if (TAO_HAS_CORBA_MESSAGING == 1)
 
-Messaging::SyncScope
-TAO_ServerRequest_Info::sync_scope (CORBA::Environment &)
+Messaging::SyncScope 
+TAO_ServerRequest_Info::sync_scope (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
  return 0;
 }
 #endif  /* TAO_HAS_CORBA_MESSAGING */
 
-PortableInterceptor::ReplyStatus
-TAO_ServerRequest_Info::reply_status (CORBA::Environment &)
+PortableInterceptor::ReplyStatus 
+TAO_ServerRequest_Info::reply_status (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
-CORBA::Object_ptr
-TAO_ServerRequest_Info::forward_reference (CORBA::Environment &)
+CORBA::Object_ptr 
+TAO_ServerRequest_Info::forward_reference (CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequest_Info::get_slot (PortableInterceptor::SlotId,
-                                  CORBA::Environment &)
+                                  CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
   return 0;
 }
 
-IOP::ServiceContext *
+IOP::ServiceContext * 
 TAO_ServerRequest_Info::get_request_service_context (IOP::ServiceId id,
-                                                     CORBA::Environment &)
+                                                     CORBA::Environment &)  
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong size = 0; size < this->service_context_list_.length (); ++size)
@@ -359,10 +359,10 @@ TAO_ServerRequest_Info::get_request_service_context (IOP::ServiceId id,
 return 0;
 }
 
-IOP::ServiceContext *
+IOP::ServiceContext * 
 TAO_ServerRequest_Info::get_reply_service_context (IOP::ServiceId id,
-                                                   CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+                                                   CORBA::Environment &)  
+  ACE_THROW_SPEC ((CORBA::SystemException)) 
 {
   for (CORBA::ULong size = 0; size < this->service_context_list_.length (); ++size)
     {
@@ -374,9 +374,9 @@ TAO_ServerRequest_Info::get_reply_service_context (IOP::ServiceId id,
 
 
 // Use at own risk. There is no way currently of extracting an
-// exception from an Any. This method is in place just to be compliant
+// exception from an Any. This method is in place just to be compliant 
 // with the spec.
-CORBA::Any *
+CORBA::Any *  
 TAO_ServerRequest_Info::sending_exception (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -387,36 +387,36 @@ TAO_ServerRequest_Info::sending_exception (CORBA::Environment &)
 }
 
 // = TAO specific method done since there currently is no simple way
-// to extract exceptions from an Any
-CORBA::Exception *
+// to extract exceptions from an Any 
+CORBA::Exception *  
 TAO_ServerRequest_Info::_sending_exception (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->caught_exception_;
 }
-
-PortableInterceptor::OctetSeq *
+  
+PortableInterceptor::OctetSeq * 
 TAO_ServerRequest_Info::object_id (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return 0;
+  return 0; 
 }
 
-PortableInterceptor::OctetSeq *
+PortableInterceptor::OctetSeq * 
 TAO_ServerRequest_Info::adapter_id (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
  return 0;
 }
 
-char *
+char * 
 TAO_ServerRequest_Info::target_most_derived_interface (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
  return 0;
 }
 
-CORBA::Policy_ptr
+CORBA::Policy_ptr 
 TAO_ServerRequest_Info::get_server_policy (CORBA::PolicyType,
                                       CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -424,7 +424,7 @@ TAO_ServerRequest_Info::get_server_policy (CORBA::PolicyType,
   return 0;
 }
 
-void
+void 
 TAO_ServerRequest_Info::set_slot (PortableInterceptor::SlotId,
                                   const CORBA::Any &,
                                   CORBA::Environment &)
@@ -433,7 +433,7 @@ TAO_ServerRequest_Info::set_slot (PortableInterceptor::SlotId,
 {
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 TAO_ServerRequest_Info::target_is_a (const char *,
                                 CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -441,7 +441,7 @@ TAO_ServerRequest_Info::target_is_a (const char *,
   return 0;
 }
 
-void
+void 
 TAO_ServerRequest_Info::add_reply_service_context (const IOP::ServiceContext & service_context,
                                                    CORBA::Boolean,
                                                    CORBA::Environment &)
diff --git a/TAO/tao/Request_Info.h b/TAO/tao/Request_Info.h
index c6ea1b151d0..1cbcaccab12 100644
--- a/TAO/tao/Request_Info.h
+++ b/TAO/tao/Request_Info.h
@@ -56,10 +56,12 @@ class TAO_Export TAO_ClientRequest_Info
                             TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Dynamic::ParameterList * arguments (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual Dynamic::ParameterList * arguments (CORBA::Environment &ACE_TRY_ENV =
+                                              TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Dynamic::ExceptionList * exceptions (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual Dynamic::ExceptionList * exceptions (CORBA::Environment &ACE_TRY_ENV =
+                                               TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ContextList * contexts (CORBA::Environment &ACE_TRY_ENV =
@@ -70,7 +72,8 @@ class TAO_Export TAO_ClientRequest_Info
                                                        TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Any * result (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Any * result (CORBA::Environment &ACE_TRY_ENV =
+                               TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean response_expected (CORBA::Environment &ACE_TRY_ENV =
@@ -195,10 +198,12 @@ class TAO_Export TAO_ServerRequest_Info
                             TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Dynamic::ParameterList * arguments (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual Dynamic::ParameterList * arguments (CORBA::Environment &ACE_TRY_ENV =
+                                              TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Dynamic::ExceptionList * exceptions (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual Dynamic::ExceptionList * exceptions (CORBA::Environment &ACE_TRY_ENV =
+                                               TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ContextList * contexts (CORBA::Environment &ACE_TRY_ENV =
@@ -209,7 +214,8 @@ class TAO_Export TAO_ServerRequest_Info
                                                        TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Any * result (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Any * result (CORBA::Environment &ACE_TRY_ENV =
+                               TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean response_expected (CORBA::Environment &ACE_TRY_ENV =